More refactoring Device -> Resource

panoramicdata · Oct 1, 2024 · e778346 · e778346
1 parent 2d3824a
commit e778346
Show file tree

Hide file tree

Showing 155 changed files with 3,438 additions and 3,059 deletions.
diff --git a/LogicMonitor.Api.Test/Attributes/IsPropertyReadonlyTests.cs b/LogicMonitor.Api.Test/Attributes/IsPropertyReadonlyTests.cs
@@ -1,3 +1,5 @@
+using LogicMonitor.Api.Resources;
+
 namespace LogicMonitor.Api.Test.Attributes;
 
 public class IsPropertyReadonlyTests

diff --git a/LogicMonitor.Api.Test/Dashboards/DashboardTests.cs b/LogicMonitor.Api.Test/Dashboards/DashboardTests.cs
@@ -209,7 +209,7 @@ public async Task Get()
 		websiteOverallStatusWidget.Should().NotBeNull();
 
 		// Device SLA widget
-		var deviceSlaStatusWidget = widgets.OfType<DeviceSlaWidget>().FirstOrDefault();
+		var deviceSlaStatusWidget = widgets.OfType<ResourceSlaWidget>().FirstOrDefault();
 		deviceSlaStatusWidget.Should().NotBeNull();
 		deviceSlaStatusWidget.Metrics.Should().NotBeNull();
 		deviceSlaStatusWidget.Metrics.Should().NotBeNullOrEmpty();

diff --git a/LogicMonitor.Api.Test/Data/DataTests.cs b/LogicMonitor.Api.Test/Data/DataTests.cs
@@ -80,7 +80,7 @@ public async Task GetOverviewGraphData()
 			.ConfigureAwait(true);
 		overviewGraph.Should().NotBeNull();
 
-		var graphDataRequest = new DeviceDataSourceGraphDataRequest
+		var graphDataRequest = new ResourceDataSourceGraphDataRequest
 		{
 			DataSourceInstanceGroupId = deviceDataSourceInstanceGroup.Id,
 			OverviewGraphId = overviewGraph.Id,
@@ -109,7 +109,7 @@ public async Task GetNetflowGraphData()
 			.ConfigureAwait(true);
 		_ = await LogicMonitorClient.GetGraphDataAsync(new NetflowGraphDataRequest
 		{
-			DeviceId = netflowDevice.Id,
+			ResourceId = netflowDevice.Id,
 			StartDateTime = new DateTime(utcNow.Year, utcNow.Month, 1).AddMonths(-1),
 			EndDateTime = new DateTime(utcNow.Year, utcNow.Month, 1),
 			NetflowFilter = new NetflowFilters(),
@@ -168,7 +168,7 @@ public async Task GetGraphData_X250()
 		var deviceDataSourceInstances = await LogicMonitorClient
 			.GetAllDeviceDataSourceInstancesAsync(WindowsDeviceId, deviceDataSource.Id, new Filter<ResourceDataSourceInstance>(), default)
 			.ConfigureAwait(true);
-		var deviceGraphDataRequest = new DeviceDataSourceInstanceGraphDataRequest
+		var deviceGraphDataRequest = new ResourceDataSourceInstanceGraphDataRequest
 		{
 			DeviceDataSourceInstanceId = deviceDataSourceInstances.Single().Id,
 			DataSourceGraphId = dataSourceGraph.Id,
@@ -214,7 +214,7 @@ public async Task GetGraphData()
 		deviceDataSourceInstances.Should().NotBeNull();
 		deviceDataSourceInstances.Should().NotBeNullOrEmpty();
 
-		var deviceGraphDataRequest = new DeviceDataSourceInstanceGraphDataRequest
+		var deviceGraphDataRequest = new ResourceDataSourceInstanceGraphDataRequest
 		{
 			DeviceDataSourceInstanceId = deviceDataSourceInstances.Single().Id,
 			DataSourceGraphId = dataSourceGraph.Id,
@@ -272,7 +272,7 @@ public async Task GetGraphDataWithoutFakeData()
 		var startDateTime = new DateTime(2023, 7, 12, 10, 0, 0, DateTimeKind.Utc);
 		var endDateTime = startDateTime.AddHours(1);
 
-		var deviceGraphDataRequest = new DeviceDataSourceInstanceGraphDataRequest
+		var deviceGraphDataRequest = new ResourceDataSourceInstanceGraphDataRequest
 		{
 			DeviceDataSourceInstanceId = deviceDataSourceInstances.Single().Id,
 			DataSourceGraphId = dataSourceGraph.Id,

diff --git a/LogicMonitor.Api.Test/Experimental/ExperimentalTests.cs b/LogicMonitor.Api.Test/Experimental/ExperimentalTests.cs
@@ -1,4 +1,5 @@
 using LogicMonitor.Api.Experimental;
+using LogicMonitor.Api.Resources;
 
 namespace LogicMonitor.Api.Test.Experimental;
 

diff --git a/LogicMonitor.Api.Test/GlobalUsings.cs b/LogicMonitor.Api.Test/GlobalUsings.cs
@@ -4,8 +4,6 @@
 global using LogicMonitor.Api.Collectors;
 global using LogicMonitor.Api.Dashboards;
 global using LogicMonitor.Api.Data;
-global using LogicMonitor.Api.DeviceProcesses;
-global using LogicMonitor.Api.Devices;
 global using LogicMonitor.Api.Extensions;
 global using LogicMonitor.Api.Filters;
 global using LogicMonitor.Api.Flows;
@@ -16,6 +14,8 @@
 global using LogicMonitor.Api.PushMetrics;
 global using LogicMonitor.Api.RecycleBin;
 global using LogicMonitor.Api.Reports;
+global using LogicMonitor.Api.ResourceProcesses;
+global using LogicMonitor.Api.Resources;
 global using LogicMonitor.Api.ScheduledDownTimes;
 global using LogicMonitor.Api.Settings;
 global using LogicMonitor.Api.Time;

diff --git a/LogicMonitor.Api.Test/Logging/LoggingTests.cs b/LogicMonitor.Api.Test/Logging/LoggingTests.cs
@@ -1,4 +1,5 @@
 using LogicMonitor.Api.Logging;
+using LogicMonitor.Api.Resources;
 using System.Globalization;
 
 namespace LogicMonitor.Api.Test.Logging;

diff --git a/LogicMonitor.Api.Test/LogicModules/DataSourceTests.cs b/LogicMonitor.Api.Test/LogicModules/DataSourceTests.cs
@@ -1,3 +1,4 @@
+using LogicMonitor.Api.ResourceProcesses;
 using LogicMonitor.Api.Test.Extensions;
 
 namespace LogicMonitor.Api.Test.LogicModules;
@@ -101,7 +102,7 @@ public async Task GetWinService()
 		var device = await GetWindowsDeviceAsync(default)
 			.ConfigureAwait(true);
 		var windowsServices = await LogicMonitorClient
-			.GetResourceProcessesAsync(device.Id, DeviceProcessServiceTaskType.WindowsService, default)
+			.GetResourceProcessesAsync(device.Id, ResourceProcessServiceTaskType.WindowsService, default)
 			.ConfigureAwait(true);
 		windowsServices.Should().NotBeNull();
 		windowsServices.Items.Should().NotBeNull();
@@ -112,7 +113,7 @@ public async Task GetWinService()
 	public async Task GetMonitoredWinService()
 	{
 		var windowsServices = await LogicMonitorClient
-			.GetMonitoredDeviceProcessesAsync(29, DeviceProcessServiceTaskType.WindowsService, default)
+			.GetMonitoredDeviceProcessesAsync(29, ResourceProcessServiceTaskType.WindowsService, default)
 			.ConfigureAwait(true);
 		windowsServices.Should().NotBeNullOrEmpty();
 	}
@@ -333,19 +334,19 @@ public async Task GetDeviceDataSourceByName_IsFast()
 		var stopwatch = Stopwatch.StartNew();
 		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(
 			425,
-			new Filter<DeviceDataSource>
+			new Filter<ResourceDataSource>
 			{
 				Take = 1,
 				Properties =
 				[
-					nameof(DeviceDataSource.Id),
-					nameof(DeviceDataSource.DataSourceName)
+					nameof(ResourceDataSource.Id),
+					nameof(ResourceDataSource.DataSourceName)
 				],
 				FilterItems =
 				[
-					new FilterItem<DeviceDataSource>
+					new FilterItem<ResourceDataSource>
 					{
-						Property = nameof(DeviceDataSource.DataSourceName),
+						Property = nameof(ResourceDataSource.DataSourceName),
 						Operation = ":",
 						Value = "SSL_Certificates"
 					}
@@ -362,14 +363,14 @@ public async Task GetDeviceDataSourceByName_IsFast()
 	[Fact]
 	public async Task GetDeviceDataSources()
 	{
-		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(WindowsDeviceId, new Filter<DeviceDataSource>
+		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(WindowsDeviceId, new Filter<ResourceDataSource>
 		{
 			Skip = 0,
 			Take = 10,
 			Properties =
 				[
-					nameof(DeviceDataSource.Id),
-					nameof(DeviceDataSource.CreatedOnSeconds),
+					nameof(ResourceDataSource.Id),
+					nameof(ResourceDataSource.CreatedOnSeconds),
 				]
 		}, default).ConfigureAwait(true);
 
@@ -378,7 +379,7 @@ public async Task GetDeviceDataSources()
 
 		foreach (var deviceDataSource in deviceDataSources)
 		{
-			// Refetch
+			// Re-fetch
 			var deviceDataSourceRefetch = await LogicMonitorClient
 				.GetDeviceDataSourceAsync(
 					WindowsDeviceId,
@@ -406,7 +407,7 @@ public async Task GetDeviceDataSources()
 			var deviceDataSourceGroups = await LogicMonitorClient.GetDeviceDataSourceGroupsPageAsync(
 				WindowsDeviceId,
 				deviceDataSource.Id,
-				new Filter<DeviceDataSourceGroup>
+				new Filter<ResourceDataSourceGroup>
 				{
 					Skip = 0,
 					Take = 300,
@@ -417,7 +418,7 @@ public async Task GetDeviceDataSources()
 			foreach (var deviceDataSourceGroup in deviceDataSourceGroups.Items)
 			{
 				// Make sure they match
-				deviceDataSourceGroup.DeviceId.Should().Be(WindowsDeviceId);
+				deviceDataSourceGroup.ResourceId.Should().Be(WindowsDeviceId);
 			}
 		}
 	}
@@ -428,13 +429,13 @@ public async Task CollectDeviceConfig()
 		var device = await GetWindowsDeviceAsync(default)
 			.ConfigureAwait(true);
 
-		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(device.Id, new Filter<DeviceDataSource>
+		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(device.Id, new Filter<ResourceDataSource>
 		{
 			Skip = 0,
 			Take = 1,
 			Properties =
 				[
-					nameof(DeviceDataSource.Id),
+					nameof(ResourceDataSource.Id),
 				]
 		}, default).ConfigureAwait(true);
 

diff --git a/LogicMonitor.Api.Test/LogicModules/EventSourceTests2.cs b/LogicMonitor.Api.Test/LogicModules/EventSourceTests2.cs
@@ -74,7 +74,7 @@ public async Task GetDeviceEventSources()
 		var deviceEventSources = await LogicMonitorClient
 			.GetDeviceEventSourcesPageAsync(
 				device.Id,
-				new Filter<DeviceEventSource> { Skip = 0, Take = 300 },
+				new Filter<ResourceEventSource> { Skip = 0, Take = 300 },
 				default)
 			.ConfigureAwait(true);
 
@@ -97,7 +97,7 @@ public async Task GetDeviceEventSources()
 	public async Task GetDeviceEventSourceByIdAsync()
 	{
 		var eventsources = await LogicMonitorClient
-			.GetDeviceEventSourcesPageAsync(WindowsDeviceId, new Filter<DeviceEventSource>(), default)
+			.GetDeviceEventSourcesPageAsync(WindowsDeviceId, new Filter<ResourceEventSource>(), default)
 			.ConfigureAwait(true);
 
 		var specificEventSource = eventsources.Items[0];
@@ -137,13 +137,13 @@ public async Task GetFilteredEventSources()
 	public async Task GetEventSourceGroupsAsync()
 	{
 		var eventSource = await LogicMonitorClient
-			.GetDeviceEventSourcesPageAsync(WindowsDeviceId, new Filter<DeviceEventSource>(), default)
+			.GetDeviceEventSourcesPageAsync(WindowsDeviceId, new Filter<ResourceEventSource>(), default)
 			.ConfigureAwait(true);
 
 		eventSource.Items.Should().NotBeNullOrEmpty();
 
 		var groups = await LogicMonitorClient
-			.GetDeviceEventSourceGroupsPageAsync(WindowsDeviceId, eventSource.Items[0].EventSourceId, new Filter<DeviceEventSourceGroup>(), default)
+			.GetDeviceEventSourceGroupsPageAsync(WindowsDeviceId, eventSource.Items[0].EventSourceId, new Filter<ResourceEventSourceGroup>(), default)
 			.ConfigureAwait(true);
 		groups.Should().NotBeNull();
 	}

diff --git a/LogicMonitor.Api.Test/OpsNotes/OpsNotesTests.cs b/LogicMonitor.Api.Test/OpsNotes/OpsNotesTests.cs
@@ -1,3 +1,5 @@
+using LogicMonitor.Api.Resources;
+
 namespace LogicMonitor.Api.Test.OpsNotes;
 
 /// <summary>
@@ -31,7 +33,7 @@ public async Task GetOpsNotes()
 	}
 
 	[Theory]
-	[InlineData(typeof(DeviceOpsNoteScopeCreationDto))]
+	[InlineData(typeof(ResourceOpsNoteScopeCreationDto))]
 	[InlineData(typeof(WebsiteOpsNoteScopeCreationDto))]
 	[InlineData(typeof(WebsiteGroupOpsNoteScopeCreationDto))]
 	[InlineData(typeof(ResourceGroupOpsNoteScopeCreationDto))]
@@ -59,7 +61,7 @@ public async Task AddRemoveOpsNote(Type t)
 			[
 				t.Name switch
 				{
-					nameof(DeviceOpsNoteScopeCreationDto) => new DeviceOpsNoteScopeCreationDto {DeviceId = device.Id},
+					nameof(ResourceOpsNoteScopeCreationDto) => new ResourceOpsNoteScopeCreationDto {ResourceId = device.Id},
 					nameof(ResourceGroupOpsNoteScopeCreationDto) => new ResourceGroupOpsNoteScopeCreationDto {ResourceGroupId = device.ResourceGroupIdsString.Split(',').Select(int.Parse).First()},
 					nameof(WebsiteOpsNoteScopeCreationDto) => new WebsiteOpsNoteScopeCreationDto {WebsitesId = website.Id},
 					nameof(WebsiteGroupOpsNoteScopeCreationDto) => new WebsiteGroupOpsNoteScopeCreationDto {WebsiteGroupId = website.GroupId},

diff --git a/...esources/DeviceDataSourceInstanceTests.cs → ...ources/ResourceDataSourceInstanceTests.cs b/...esources/DeviceDataSourceInstanceTests.cs → ...ources/ResourceDataSourceInstanceTests.cs
@@ -1,6 +1,6 @@
 namespace LogicMonitor.Api.Test.Resources;
 
-public class DeviceDataSourceInstanceTests(ITestOutputHelper iTestOutputHelper, Fixture fixture) : TestWithOutput(iTestOutputHelper, fixture)
+public class ResourceDataSourceInstanceTests(ITestOutputHelper iTestOutputHelper, Fixture fixture) : TestWithOutput(iTestOutputHelper, fixture)
 {
 	[Fact]
 	public async Task GetAllDeviceDataSourceInstancesAsync()
@@ -58,18 +58,18 @@ public async Task AddDeviceDataSourceInstance()
 	{
 		var resource = await GetWindowsDeviceAsync(default)
 			.ConfigureAwait(true);
-		var resourceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(resource.Id, new Filter<DeviceDataSource>
+		var resourceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(resource.Id, new Filter<ResourceDataSource>
 		{
 			Skip = 0,
 			Take = 10,
 			Properties =
 				[
-					nameof(DeviceDataSource.Id),
+					nameof(ResourceDataSource.Id),
 				]
 		}, default)
 			.ConfigureAwait(true);
 
-		var newInstance = new DeviceDataSourceInstanceCreationDto()
+		var newInstance = new ResourceDataSourceInstanceCreationDto()
 		{
 			DisplayName = "lornaTest",
 			Description = "test",
@@ -120,13 +120,13 @@ public async Task GetDataPointConfiguration()
 	{
 		var device = await GetWindowsDeviceAsync(default)
 			.ConfigureAwait(true);
-		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(device.Id, new Filter<DeviceDataSource>
+		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(device.Id, new Filter<ResourceDataSource>
 		{
 			Skip = 0,
 			Take = 10,
 			Properties =
 				[
-					nameof(DeviceDataSource.Id),
+					nameof(ResourceDataSource.Id),
 				]
 		}, default).ConfigureAwait(true);
 
@@ -150,13 +150,13 @@ public async Task UpdateDataPointConfig()
 	{
 		var device = await GetWindowsDeviceAsync(default)
 			.ConfigureAwait(true);
-		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(device.Id, new Filter<DeviceDataSource>
+		var deviceDataSources = await LogicMonitorClient.GetAllDeviceDataSourcesAsync(device.Id, new Filter<ResourceDataSource>
 		{
 			Skip = 0,
 			Take = 10,
 			Properties =
 				[
-					nameof(DeviceDataSource.Id),
+					nameof(ResourceDataSource.Id),
 				]
 		}, default).ConfigureAwait(true);
 

diff --git a/...i.Test/Resources/DeviceDataSourceTests.cs → ...Test/Resources/ResourceDataSourceTests.cs b/...i.Test/Resources/DeviceDataSourceTests.cs → ...Test/Resources/ResourceDataSourceTests.cs
@@ -1,6 +1,6 @@
 namespace LogicMonitor.Api.Test.Resources;
 
-public class DeviceDataSourceTests(ITestOutputHelper iTestOutputHelper, Fixture fixture) : TestWithOutput(iTestOutputHelper, fixture)
+public class ResourceDataSourceTests(ITestOutputHelper iTestOutputHelper, Fixture fixture) : TestWithOutput(iTestOutputHelper, fixture)
 {
 	[Fact]
 	public async Task GetAllDeviceDataSourcesAsync()
@@ -26,7 +26,7 @@ public async Task DeviceDataSourceTests2()
 		// We have devices
 
 		// Find datacenter devices with WinCPU datasource
-		var deviceDataSources = new List<DeviceDataSource>();
+		var resourceDataSources = new List<ResourceDataSource>();
 		foreach (var device in resources)
 		{
 			if (dataSource != null)
@@ -39,11 +39,11 @@ public async Task DeviceDataSourceTests2()
 					continue;
 				}
 
-				deviceDataSources.Add(deviceDataSourceByDeviceIdAndDataSourceId);
+				resourceDataSources.Add(deviceDataSourceByDeviceIdAndDataSourceId);
 			}
 		}
 
-		deviceDataSources.Should().NotBeNullOrEmpty();
+		resourceDataSources.Should().NotBeNullOrEmpty();
 	}
 
 	[Fact]