Issue #172: Add Hardware Module back to MetricsHub

* Updated IT tests to call the Hardware strategies. * Updated expected.json files from both DellOpenManageIT and SuperConnectorOsIT.
sentrysoftware · May 17, 2024 · e5cb267 · e5cb267
1 parent 5dea901
commit e5cb267
Show file tree

Hide file tree

Showing 4 changed files with 22,184 additions and 13,265 deletions.
diff --git a/...shub-hardware/src/it/java/org/sentrysoftware/metricshub/hardware/it/DellOpenManageIT.java b/...shub-hardware/src/it/java/org/sentrysoftware/metricshub/hardware/it/DellOpenManageIT.java
@@ -22,6 +22,9 @@
 import org.sentrysoftware.metricshub.extension.snmp.SnmpConfiguration;
 import org.sentrysoftware.metricshub.extension.snmp.SnmpConfiguration.SnmpVersion;
 import org.sentrysoftware.metricshub.extension.snmp.SnmpExtension;
+import org.sentrysoftware.metricshub.hardware.strategy.HardwarePostCollectStrategy;
+import org.sentrysoftware.metricshub.hardware.strategy.HardwarePostDiscoveryStrategy;
+import org.sentrysoftware.metricshub.hardware.strategy.HardwareStrategy;
 import org.sentrysoftware.metricshub.it.job.snmp.SnmpITJob;
 
 class DellOpenManageIT {
@@ -95,12 +98,15 @@ void test() throws Exception {
 			.withServerRecordData("snmp/DellOpenManageIT/input/input.snmp")
 			.executeStrategies(
 				new DetectionStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager),
-				new DiscoveryStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager)
+				new DiscoveryStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager),
+				new HardwarePostDiscoveryStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager)
 			)
 			.executeStrategies(
 				new PrepareCollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
 				new ProtocolHealthCheckStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
-				new CollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager)
+				new CollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
+				new HardwarePostCollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
+				new HardwareStrategy(telemetryManager, collectTime)
 			)
 			.verifyExpected("snmp/DellOpenManageIT/expected/expected.json");
 	}

diff --git a/...ub-hardware/src/it/java/org/sentrysoftware/metricshub/hardware/it/SuperConnectorOsIT.java b/...ub-hardware/src/it/java/org/sentrysoftware/metricshub/hardware/it/SuperConnectorOsIT.java
@@ -21,6 +21,9 @@
 import org.sentrysoftware.metricshub.engine.telemetry.TelemetryManager;
 import org.sentrysoftware.metricshub.extension.oscommand.OsCommandConfiguration;
 import org.sentrysoftware.metricshub.extension.oscommand.OsCommandExtension;
+import org.sentrysoftware.metricshub.hardware.strategy.HardwarePostCollectStrategy;
+import org.sentrysoftware.metricshub.hardware.strategy.HardwarePostDiscoveryStrategy;
+import org.sentrysoftware.metricshub.hardware.strategy.HardwareStrategy;
 import org.sentrysoftware.metricshub.it.job.oscommand.SuperConnectorITJob;
 
 class SuperConnectorOsIT {
@@ -73,12 +76,15 @@ void test() throws Exception {
 		new SuperConnectorITJob(clientsExecutor, telemetryManager)
 			.executeStrategies(
 				new DetectionStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager),
-				new DiscoveryStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager)
+				new DiscoveryStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager),
+				new HardwarePostDiscoveryStrategy(telemetryManager, discoveryTime, clientsExecutor, extensionManager)
 			)
 			.executeStrategies(
 				new PrepareCollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
 				new ProtocolHealthCheckStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
-				new CollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager)
+				new CollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
+				new HardwarePostCollectStrategy(telemetryManager, collectTime, clientsExecutor, extensionManager),
+				new HardwareStrategy(telemetryManager, collectTime)
 			)
 			.verifyExpected("os/SuperConnectorOsIT/expected/expected.json");
 	}