MIGENG-406: Uefi boot flag should be triggered by firmware=bios (#80)

project-xavier · Feb 11, 2021 · 7377523 · 7377523
1 parent 2ab015c
commit 7377523
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/resources/org/jboss/xavier/analytics/rules/workload/inventory/Flags.drl b/src/main/resources/org/jboss/xavier/analytics/rules/workload/inventory/Flags.drl
@@ -103,7 +103,7 @@ rule "Flag_UEFI_Boot"
     when
         vmWorkloadInventoryModel : VMWorkloadInventoryModel(
             firmware != null,
-            firmware.equalsIgnoreCase("EFI")
+            firmware.equalsIgnoreCase("EFI") || firmware.equalsIgnoreCase("BIOS")
         )
         workloadInventoryReport : WorkloadInventoryReportModel()
     then

diff --git a/src/test/java/org/jboss/xavier/analytics/rules/workload/inventory/FlagsTest.java b/src/test/java/org/jboss/xavier/analytics/rules/workload/inventory/FlagsTest.java
@@ -675,15 +675,17 @@ public void test_BIOS_Boot()
         facts.put("workloadInventoryReportModel",workloadInventoryReportModel);
 
         Map<String, Object> results = createAndExecuteCommandsAndGetResults(facts);
-        Assert.assertEquals(1, results.get(NUMBER_OF_FIRED_RULE_KEY));
-        Utils.verifyRulesFiredNames(this.agendaEventListener, "AgendaFocusForTest");
+        Assert.assertEquals(2, results.get(NUMBER_OF_FIRED_RULE_KEY));
+        Utils.verifyRulesFiredNames(this.agendaEventListener, "AgendaFocusForTest", "Flag_UEFI_Boot");
 
         List<WorkloadInventoryReportModel> reports = Utils.extractModels(GET_OBJECTS_KEY, results, WorkloadInventoryReportModel.class);
         // just one report has to be created
         Assert.assertEquals(1, reports.size());
         WorkloadInventoryReportModel report = reports.get(0);
         Set<String> flagsIMS = report.getFlagsIMS();
-        Assert.assertNull(flagsIMS);
+        Assert.assertEquals(1, flagsIMS.size());
+        Assert.assertTrue(flagsIMS.contains(WorkloadInventoryReportModel.UEFI_BOOT_FLAG_NAME));
+
 
     }