Fixed pascal casing of "SDT"

panoramicdata · Dec 7, 2023 · 288eb97 · 288eb97
1 parent 387cfd7
commit 288eb97
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 18 deletions.
diff --git a/LogicMonitor.Api.Test/ScheduledDownTimes/ScheduledDownTimeTests.cs b/LogicMonitor.Api.Test/ScheduledDownTimes/ScheduledDownTimeTests.cs
@@ -195,7 +195,7 @@ await LogicMonitorClient
 	public async Task AddAndDeleteAResourceGroupSdt()
 	{
 		const string initialComment = "LogicMonitor.Api unit tests - AddAndDeleteAResourceGroupSdt initial comment";
-		var resourceGroupId = SDTResourceGroupId;
+		var resourceGroupId = SdtResourceGroupId;
 		var sdtCreationDto = new ResourceGroupScheduledDownTimeCreationDto(resourceGroupId)
 		{
 			Comment = initialComment,

diff --git a/LogicMonitor.Api.Test/TestPortalConfig.cs b/LogicMonitor.Api.Test/TestPortalConfig.cs
@@ -39,7 +39,7 @@ internal TestPortalConfig(ILogger logger)
 		WindowsDeviceLargeDeviceDataSourceId = int.Parse(Configuration["Config:WindowsDeviceLargeDeviceDataSourceId"] ?? "0", CultureInfo.InvariantCulture);
 		ServiceDeviceId = int.Parse(Configuration["Config:ServiceDeviceId"] ?? "0", CultureInfo.InvariantCulture);
 		CollectorId = int.Parse(Configuration["Config:CollectorId"] ?? "0", CultureInfo.InvariantCulture);
-		SDTResourceGroupId = int.Parse(Configuration["Config:SDTResourceGroupId"] ?? "0", CultureInfo.InvariantCulture);
+		SdtResourceGroupId = int.Parse(Configuration["Config:SDTResourceGroupId"] ?? "0", CultureInfo.InvariantCulture);
 		TestDashboardId = int.Parse(Configuration["Config:TestDashboardId"] ?? "0", CultureInfo.InvariantCulture);
 		WebsiteGroupFullPath = Configuration["Config:WebsiteGroupFullPath"] ?? "";
 		DeviceGroupFullPath = Configuration["Config:DeviceGroupFullPath"] ?? "";
@@ -78,7 +78,7 @@ internal TestPortalConfig(ILogger logger)
 
 	internal int CollectorId { get; }
 
-	public int SDTResourceGroupId { get; }
+	public int SdtResourceGroupId { get; }
 
 	public string AlertRuleName { get; }
 

diff --git a/LogicMonitor.Api.Test/TestWithOutput.cs b/LogicMonitor.Api.Test/TestWithOutput.cs
@@ -20,7 +20,7 @@ public abstract class TestWithOutput
 
 	protected int WindowsDeviceId { get; }
 
-	protected int SDTResourceGroupId { get; }
+	protected int SdtResourceGroupId { get; }
 
 	protected int WindowsDeviceLargeDeviceDataSourceId { get; }
 
@@ -44,12 +44,12 @@ protected TestWithOutput(ITestOutputHelper iTestOutputHelper)
 		WindowsDeviceLargeDeviceDataSourceId = testPortalConfig.WindowsDeviceLargeDeviceDataSourceId;
 		ServiceDeviceId = testPortalConfig.ServiceDeviceId;
 		NetflowDeviceId = testPortalConfig.NetflowDeviceId;
-		SDTResourceGroupId = testPortalConfig.SDTResourceGroupId;
+		SdtResourceGroupId = testPortalConfig.SdtResourceGroupId;
 		TestDashboardId = testPortalConfig.TestDashboardId;
 		DeviceGroupFullPath = testPortalConfig.DeviceGroupFullPath;
 		WebsiteGroupFullPath = testPortalConfig.WebsiteGroupFullPath;
 		ResourceGroupFullPath = testPortalConfig.ResourceGroupFullPath;
-		SDTResourceGroupId = testPortalConfig.SDTResourceGroupId;
+		SdtResourceGroupId = testPortalConfig.SdtResourceGroupId;
 		WebsiteName = testPortalConfig.WebsiteName;
 		SnmpDeviceId = testPortalConfig.SnmpDeviceId;
 		AllWidgetsDashboardId = testPortalConfig.AllWidgetsDashboardId;

diff --git a/LogicMonitor.Api.Test/Websites/WebsiteTests.cs b/LogicMonitor.Api.Test/Websites/WebsiteTests.cs
@@ -153,7 +153,7 @@ await LogicMonitorClient
 			ParentId = "1",
 			Properties =
 			[
-				new EntityProperty {Name = "name", Value = "value"}
+				new EntityProperty { Name = "name", Value = "value" }
 			]
 			//TestLocation = new TestLocation { All = true, SmgIds = new List<int> { 1, 2, 4, 3, 5, 6 } }
 		}, default).ConfigureAwait(true);
@@ -293,14 +293,14 @@ await LogicMonitorClient
 	}
 
 	[Fact]
-	public async Task GetWebsiteSDTs()
+	public async Task GetWebsiteSdts()
 	{
 		var websiteList = await LogicMonitorClient
 			.GetAllAsync<Website>(default)
 			.ConfigureAwait(true);
 
 		var sdts = await LogicMonitorClient
-			.GetWebsiteSDTListAsync(websiteList[0].Id, new Filter<ScheduledDownTime>(), default)
+			.GetWebsiteSdtListAsync(websiteList[0].Id, new Filter<ScheduledDownTime>(), default)
 			.ConfigureAwait(true);
 		sdts.Should().NotBeNull();
 	}

diff --git a/LogicMonitor.Api/Dashboards/NOCWidgetDataItem.cs b/LogicMonitor.Api/Dashboards/NOCWidgetDataItem.cs
@@ -10,7 +10,7 @@ public class NOCWidgetDataItem
 	/// Whether this is in scheduled downtime
 	/// </summary>
 	[DataMember(Name = "inSDT")]
-	public bool InSDT { get; set; }
+	public bool InSdt { get; set; }
 
 	/// <summary>
 	/// The type of the widget data item
@@ -79,13 +79,13 @@ public class NOCWidgetDataItem
 	/// Number in scheduled downtime error alerts
 	/// </summary>
 	[DataMember(Name = "inSDTErrorAlert")]
-	public int InSDTErrorAlert { get; set; }
+	public int InSdtErrorAlert { get; set; }
 
 	/// <summary>
 	/// Number of in scheduled downtime and confirmed error alerts
 	/// </summary>
 	[DataMember(Name = "inSDTAndConfirmedErrorAlert")]
-	public int InSDTAndConfirmedErrorAlert { get; set; }
+	public int InSdtAndConfirmedErrorAlert { get; set; }
 
 	/// <summary>
 	/// Number of error alerts
@@ -103,13 +103,13 @@ public class NOCWidgetDataItem
 	/// Number in scheduled downtime and critical alerts
 	/// </summary>
 	[DataMember(Name = "inSDTCriticalAlert")]
-	public int InSDTCriticalAlert { get; set; }
+	public int InSdtCriticalAlert { get; set; }
 
 	/// <summary>
 	/// Number in scheduled downtime and confirmed critical alerts
 	/// </summary>
 	[DataMember(Name = "inSDTAndConfirmedCriticalAlert")]
-	public int InSDTAndConfirmedCriticalAlert { get; set; }
+	public int InSdtAndConfirmedCriticalAlert { get; set; }
 
 	/// <summary>
 	/// Number of critical alerts

diff --git a/LogicMonitor.Api/LogicMonitorClient_Websites.cs b/LogicMonitor.Api/LogicMonitorClient_Websites.cs
@@ -372,7 +372,7 @@ await Task.WhenAll(alertFilterList.Select(async individualAlertFilter =>
 	/// <summary>
 	/// get a list of SDTs for a website
 	/// </summary>
-	public async Task<Page<ScheduledDownTime>> GetWebsiteSDTListAsync(
+	public async Task<Page<ScheduledDownTime>> GetWebsiteSdtListAsync(
 		int websiteId,
 		Filter<ScheduledDownTime> filter,
 		CancellationToken cancellationToken)

diff --git a/LogicMonitor.Api/Reports/SlaReportMetric.cs b/LogicMonitor.Api/Reports/SlaReportMetric.cs
@@ -52,5 +52,5 @@ public class SlaReportMetric
 	/// The exclusion SDT type
 	/// </summary>
 	[DataMember(Name = "exclusionSDTType")]
-	public string ExclusionSDTType { get; set; } = string.Empty;
+	public string ExclusionSdtType { get; set; } = string.Empty;
 }
diff --git a/LogicMonitor.Api/Reports/WebsiteOverviewReport.cs b/LogicMonitor.Api/Reports/WebsiteOverviewReport.cs
@@ -34,7 +34,7 @@ public class WebsiteOverviewReport : DateRangeReport
 	/// Whether to exclude SDT
 	/// </summary>
 	[DataMember(Name = "excludeSDT")]
-	public bool ExcludeSDT { get; set; }
+	public bool ExcludeSdt { get; set; }
 
 	/// <summary>
 	/// Whether to exclude services with 100% availability

diff --git a/LogicMonitor.Api/Reports/WebsiteSlaReportMetric.cs b/LogicMonitor.Api/Reports/WebsiteSlaReportMetric.cs
@@ -22,5 +22,5 @@ public class WebsiteSlaReportMetric
 	/// Whether to exclude alerts occurring in SDT
 	/// </summary>
 	[DataMember(Name = "excludeSDT")]
-	public bool ExcludeSDT { get; set; }
+	public bool ExcludeSdt { get; set; }
 }
diff --git a/LogicMonitor.Api/Settings/HttpIntegration.cs b/LogicMonitor.Api/Settings/HttpIntegration.cs
@@ -84,6 +84,36 @@ public class HttpIntegration : Integration
 	[DataMember(Name = "ackOAuthVersion")]
 	public string? AckOAuthVersion { get; set; } = string.Empty;
 
+	/// <summary>
+	///     The ACK OAuth grant type
+	/// </summary>
+	[DataMember(Name = "ackOAuthGrantType")]
+	public string? AckOAuthGrantType { get; set; } = string.Empty;
+
+	/// <summary>
+	///     The ACK OAuth access token Url
+	/// </summary>
+	[DataMember(Name = "ackOAuthAccessTokenUrl")]
+	public string? AckOAuthAccessTokenUrl { get; set; } = string.Empty;
+
+	/// <summary>
+	///     The ACK OAuth client id
+	/// </summary>
+	[DataMember(Name = "ackOAuthClientId")]
+	public string? AckOAuthClientId { get; set; } = string.Empty;
+
+	/// <summary>
+	///     The ACK OAuth client secret
+	/// </summary>
+	[DataMember(Name = "ackOAuthClientSecret")]
+	public string? AckOAuthClientSecret { get; set; } = string.Empty;
+
+	/// <summary>
+	///     The ACK OAuth scope
+	/// </summary>
+	[DataMember(Name = "ackOAuthScope")]
+	public string? AckOAuthScope { get; set; } = string.Empty;
+
 	/// <summary>
 	///     The OAuth version
 	/// </summary>

diff --git a/LogicMonitor.Api/Topologies/Topology.cs b/LogicMonitor.Api/Topologies/Topology.cs
@@ -67,6 +67,12 @@ public class Topology : NamedItem, IHasEndpoint
 	[DataMember(Name = "views")]
 	public List<TopologyView> Views { get; set; } = [];
 
+	/// <summary>
+	///    The connections
+	/// </summary>
+	[DataMember(Name = "connections")]
+	public List<TopologyConnection> Connection { get; set; } = [];
+
 	/// <summary>
 	/// The REST API endpoint
 	/// </summary>

diff --git a/LogicMonitor.Api/Topologies/TopologyConnection.cs b/LogicMonitor.Api/Topologies/TopologyConnection.cs
@@ -0,0 +1,9 @@
+namespace LogicMonitor.Api.Topologies;
+
+/// <summary>
+/// A Topology connection
+/// </summary>
+[DataContract]
+public class TopologyConnection
+{
+}