Skip to content

MIGENG-838: empty string no longer triggers Numa Node Affinity and Cp… #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MIGENG-838: empty string no longer triggers Numa Node Affinity and Cp… #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/resources/org/jboss/xavier/analytics/rules/workload/inventory/Flags.drl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ end
rule "Flag_Cpu_Affinity"
when
vmWorkloadInventoryModel : VMWorkloadInventoryModel(
cpuAffinity != null
cpuAffinity != null,
cpuAffinity.trim().length() > 0
)
workloadInventoryReport : WorkloadInventoryReportModel()
then
Expand Down Expand Up @@ -145,7 +146,8 @@ end
rule "Flag_Numa_Node_Affinity"
when
vmWorkloadInventoryModel : VMWorkloadInventoryModel(
numaNodeAffinity != null
numaNodeAffinity != null,
numaNodeAffinity.trim().length() > 0
)
workloadInventoryReport : WorkloadInventoryReportModel()
then
Expand Down
55 changes: 54 additions & 1 deletion src/test/java/org/jboss/xavier/analytics/rules/workload/inventory/FlagsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,33 @@ public void test_CpuAffinityNotNull()

}

@Test
public void test_CpuAffinityEmpty()
{
Map<String, Object> facts = new HashMap<>();
// always add a String fact with the name of the agenda group defined in the DRL file (e.g. "SourceCosts")
facts.put("agendaGroup", "Flags");

VMWorkloadInventoryModel vmWorkloadInventoryModel = new VMWorkloadInventoryModel();
vmWorkloadInventoryModel.setCpuAffinity("");
facts.put("vmWorkloadInventoryModel", vmWorkloadInventoryModel);

WorkloadInventoryReportModel workloadInventoryReportModel = new WorkloadInventoryReportModel();
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");

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

}

@Test
public void test_CpuAffinityNull()
{
Expand Down Expand Up @@ -453,7 +480,7 @@ public void test_hasPassthroughDeviceFalse () {
}

@Test
public void test_NumaNodeAffinityNotNull()
public void test_NumaNodeAffinitySet()
{
Map<String, Object> facts = new HashMap<>();
// always add a String fact with the name of the agenda group defined in the DRL file (e.g. "SourceCosts")
Expand All @@ -479,6 +506,32 @@ public void test_NumaNodeAffinityNotNull()

}

@Test
public void test_NumaNodeAffinityNotSet()
{
Map<String, Object> facts = new HashMap<>();
// always add a String fact with the name of the agenda group defined in the DRL file (e.g. "SourceCosts")
facts.put("agendaGroup", "Flags");
VMWorkloadInventoryModel vmWorkloadInventoryModel = new VMWorkloadInventoryModel();
vmWorkloadInventoryModel.setNumaNodeAffinity("");
facts.put("vmWorkloadInventoryModel", vmWorkloadInventoryModel);

WorkloadInventoryReportModel workloadInventoryReportModel = new WorkloadInventoryReportModel();
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");

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

}

@Test
public void test_VmHostAffinityConfigured()
{
Expand Down