MIGENG-687 Remove reevaluate for shared disks (#79)

* MIGENG-687:Shared_VMDK flag * MIGENG-687: added target/category information to shared vmdk flag * MIGENG-687: remove reevaluate for shared disks * MIGENG-687: remove unused code
project-xavier · Jan 7, 2021 · 2ab015c · 2ab015c
1 parent 8b79954
commit 2ab015c
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 396 deletions.
diff --git a/src/main/java/org/jboss/xavier/analytics/functions/HelperFunctions.java b/src/main/java/org/jboss/xavier/analytics/functions/HelperFunctions.java
@@ -97,7 +97,6 @@ public static Optional<OSSupport> findOSSupportForOS(String osName)
 
     public enum FlagUnsuitabilityForTargets{
         RDM_DISK(WorkloadInventoryReportModel.RDM_DISK_FLAG_NAME, true, false, null),
-        SHARED_DISK(WorkloadInventoryReportModel.SHARED_DISK_FLAG_NAME,true, true, WorkloadInventoryReportModel.FLAG_CATEGORY_CRITICAL),
         CPU_MEMORY_HOTPLUG(WorkloadInventoryReportModel.CPU_MEMORY_HOTPLUG_FLAG_NAME, true, true, null),
         CPU_AFFINITY(WorkloadInventoryReportModel.CPU_AFFINITY_FLAG_NAME, false, true, WorkloadInventoryReportModel.FLAG_CATEGORY_WARNING),
         UEFI_BOOT(WorkloadInventoryReportModel.UEFI_BOOT_FLAG_NAME, false, true, WorkloadInventoryReportModel.FLAG_CATEGORY_CRITICAL),
@@ -111,7 +110,8 @@ public enum FlagUnsuitabilityForTargets{
         HAS_PASSTHROUGH_DEVICE(WorkloadInventoryReportModel.PASSTHROUGH_DEVICE_FLAG_NAME, false, true, WorkloadInventoryReportModel.FLAG_CATEGORY_CRITICAL),
         HAS_USB_CONTROLLERS(WorkloadInventoryReportModel.USB_CONTROLLERS_FLAG_NAME, false, true, WorkloadInventoryReportModel.FLAG_CATEGORY_WARNING),
         SR_IOV_NIC(WorkloadInventoryReportModel.SR_IOV_NIC_FLAG_NAME, false, true, WorkloadInventoryReportModel.FLAG_CATEGORY_CRITICAL),
-        SHARED_VMDK(WorkloadInventoryReportModel.SHARED_VMDK_FLAG_NAME, false, true, WorkloadInventoryReportModel.FLAG_CATEGORY_CRITICAL);
+        SHARED_VMDK(WorkloadInventoryReportModel.SHARED_VMDK_FLAG_NAME, true, true, WorkloadInventoryReportModel.FLAG_CATEGORY_CRITICAL);
+
 
         private final String name;
         private final boolean isUnsuitableForOSP;

diff --git a/...g/jboss/xavier/analytics/pojo/output/workload/inventory/WorkloadInventoryReportModel.java b/...g/jboss/xavier/analytics/pojo/output/workload/inventory/WorkloadInventoryReportModel.java
@@ -19,7 +19,6 @@ public class WorkloadInventoryReportModel
     static final long serialVersionUID = 1L;
 
     public static final String RDM_DISK_FLAG_NAME = "RDM";
-    public static final String SHARED_DISK_FLAG_NAME = "Shared Disk";
     public static final String CPU_MEMORY_HOTPLUG_FLAG_NAME = "CPU/memory hotplug";
     public static final String CPU_AFFINITY_FLAG_NAME = "CPU affinity";
     public static final String USB_CONTROLLERS_FLAG_NAME = "USB controller";

diff --git a/src/main/resources/META-INF/kmodule.xml b/src/main/resources/META-INF/kmodule.xml
@@ -14,7 +14,4 @@
   <kbase name="WorkloadSummaryKBase" default="false" eventProcessingMode="stream" equalsBehavior="identity" packages="org.jboss.xavier.analytics.rules.workload.summary">
     <ksession name="WorkloadSummaryKSession0" type="stateless" default="true" clockType="realtime"/>
   </kbase>
-  <kbase name="WorkloadInventoryReevaluateKBase" default="false" eventProcessingMode="stream" equalsBehavior="identity" packages="org.jboss.xavier.analytics.rules.agendafocus.reevaluate, org.jboss.xavier.analytics.rules.workload.inventory.complexity, org.jboss.xavier.analytics.rules.workload.inventory.targets, org.jboss.xavier.analytics.rules.workload.inventory.queries, org.jboss.xavier.analytics.rules.workload.inventory.category">
-    <ksession name="WorkloadInventoryReevaluateKSession0" type="stateless" default="true" clockType="realtime"/>
-  </kbase>
 </kmodule>
diff --git a/...rces/org/jboss/xavier/analytics/rules/agendafocus/reevaluate/AgendaFocusForReevaluate.drl b/...rces/org/jboss/xavier/analytics/rules/agendafocus/reevaluate/AgendaFocusForReevaluate.drl
diff --git a/...sources/org/jboss/xavier/analytics/rules/workload/inventory/targets/TargetsReevaluate.drl b/...sources/org/jboss/xavier/analytics/rules/workload/inventory/targets/TargetsReevaluate.drl
diff --git a/src/test/java/org/jboss/xavier/analytics/rules/workload/inventory/TargetsTest.java b/src/test/java/org/jboss/xavier/analytics/rules/workload/inventory/TargetsTest.java
@@ -55,7 +55,7 @@ public void testTargetsFlagsExistConvertibleOS() {
         WorkloadInventoryReportModel workloadInventoryReportModel = new WorkloadInventoryReportModel();
         workloadInventoryReportModel.setOsDescription("CentOS");
         workloadInventoryReportModel.addFlagIMS(WorkloadInventoryReportModel.RDM_DISK_FLAG_NAME);
-        workloadInventoryReportModel.addFlagIMS(WorkloadInventoryReportModel.SHARED_DISK_FLAG_NAME);
+        workloadInventoryReportModel.addFlagIMS(WorkloadInventoryReportModel.SHARED_VMDK_FLAG_NAME);
 
         facts.put("workloadInventoryReportModel",workloadInventoryReportModel);
 
@@ -445,7 +445,7 @@ public void testNoOCPTargetSharedDiskFlagSupportedOS() {
         WorkloadInventoryReportModel workloadInventoryReportModel = new WorkloadInventoryReportModel();
         workloadInventoryReportModel.setOsDescription("Red Hat Enterprise Linux v7.6");
         workloadInventoryReportModel.addFlagIMS(WorkloadInventoryReportModel.RDM_DISK_FLAG_NAME);
-        workloadInventoryReportModel.addFlagIMS(WorkloadInventoryReportModel.SHARED_DISK_FLAG_NAME);
+        workloadInventoryReportModel.addFlagIMS(WorkloadInventoryReportModel.SHARED_VMDK_FLAG_NAME);
 
         facts.put("workloadInventoryReportModel",workloadInventoryReportModel);
 

diff --git a/.../org/jboss/xavier/analytics/rules/workload/inventory/WorkloadInventoryReevaluateTest.java b/.../org/jboss/xavier/analytics/rules/workload/inventory/WorkloadInventoryReevaluateTest.java
diff --git a/...java/org/jboss/xavier/analytics/rules/workload/inventory/WorkloadInventoryReportTest.java b/...java/org/jboss/xavier/analytics/rules/workload/inventory/WorkloadInventoryReportTest.java
@@ -25,7 +25,7 @@ public class WorkloadInventoryReportTest extends BaseIntegrationTest {
 
     public WorkloadInventoryReportTest()
     {
-        super("WorkloadInventoryKSession0", "org.jboss.xavier.analytics.rules.workload.inventory.*", 74);
+        super("WorkloadInventoryKSession0", "org.jboss.xavier.analytics.rules.workload.inventory.*", 72);
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up @@
         public WorkloadInventoryReportTest()
         {
-            super("WorkloadInventoryKSession0", "org.jboss.xavier.analytics.rules.workload.inventory.*", 74);
+            super("WorkloadInventoryKSession0", "org.jboss.xavier.analytics.rules.workload.inventory.*", 72);
         }
         @Test
@@ Expand Down @@