update conversion to enum states

ThomasW-Skyline · ThomasW-Skyline · commit 08b4f3dbe861 · 2024-11-13T09:51:00.000+01:00
diff --git a/QAction_1/ProtocolExtensions.cs b/QAction_1/ProtocolExtensions.cs
@@ -3,7 +3,6 @@ namespace Skyline.Protocol.Extension
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
-
 	using Skyline.DataMiner.Scripting;
 
 	public static class ProtocolExtension
diff --git a/QAction_1/SnmpAgentState.cs b/QAction_1/SnmpAgentState.cs
@@ -0,0 +1,8 @@
+﻿namespace Skyline.Protocol.Extension
+{
+	public enum SnmpAgentStates
+	{
+		NotRestarted = 0,
+		Restarted = 1,
+	}
+}
diff --git a/QAction_1000/IfTable.cs b/QAction_1000/IfTable.cs
@@ -150,7 +150,7 @@ public void ProcessData()
 				ProcessUtilization(duplexStatuses, i, key, bitrateIn, bitrateOut);
 			}
 
-			if (iftableGetter.IsSnmpAgentRestarted)
+			if (iftableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted)
 			{
 				iftableSetter.SetParamsData[Parameter.iftablesnmpagentrestartflag] = 0;
 			}
@@ -180,7 +180,7 @@ private void ProcessBitRates(SnmpDeltaHelper snmpDeltaHelper, int getPosition, o
 			string discontinuityTime = Convert.ToString(iftableGetter.Discontinuity[getPosition]);
 			bool discontinuity = Interface.HasDiscontinuity(discontinuityTime, rateData.DiscontinuityTime);
 
-			if (iftableGetter.IsSnmpAgentRestarted || discontinuity)
+			if (iftableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted || discontinuity)
 			{
 				rateData.BitrateIn = SnmpRate32.FromJsonString(String.Empty, MinDelta, MaxDelta);
 				rateData.BitrateOut = SnmpRate32.FromJsonString(String.Empty, MinDelta, MaxDelta);
@@ -281,12 +281,12 @@ public IfTableGetter(SLProtocol protocol)
 
 			public object[] RateData { get; private set; }
 
-			public bool IsSnmpAgentRestarted { get; private set; }
+			public SnmpAgentStates IsSnmpAgentRestarted { get; private set; }
 
 			public void Load()
 			{
-				IsSnmpAgentRestarted = Convert.ToBoolean(Convert.ToInt16(protocol.GetParameter(Parameter.iftablesnmpagentrestartflag)));
-
+				Enum.TryParse<SnmpAgentStates>(Convert.ToString(protocol.GetParameter(Parameter.iftablesnmpagentrestartflag)), out var snmpAgentState);
+				IsSnmpAgentRestarted = snmpAgentState;
 				LoadIfTable();
 				LoadIfXTable();
 			}
diff --git a/QAction_1100/IfXTable.cs b/QAction_1100/IfXTable.cs
@@ -149,7 +149,7 @@ public void ProcessData()
 				ProcessUtilization(duplexStatuses, i, key, bitrateIn, bitrateOut);
 			}
 
-			if (ifxTableGetter.IsSnmpAgentRestarted)
+			if (ifxTableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted)
 			{
 				ifxTableSetter.SetParamsData[Parameter.ifxtablesnmpagentrestartflag] = 0;
 			}
@@ -179,7 +179,7 @@ private void ProcessBitRates(SnmpDeltaHelper snmpDeltaHelper, int getPosition, o
 			string discontinuityTime = Convert.ToString(ifxTableGetter.Discontinuity[getPosition]);
 			bool discontinuity = Interface.HasDiscontinuity(discontinuityTime, rateData.DiscontinuityTime);
 
-			if (ifxTableGetter.IsSnmpAgentRestarted || discontinuity)
+			if (ifxTableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted || discontinuity)
 			{
 				rateData.BitrateIn = SnmpRate64.FromJsonString(String.Empty, MinDelta, MaxDelta);
 				rateData.BitrateOut = SnmpRate64.FromJsonString(String.Empty, MinDelta, MaxDelta);
@@ -279,11 +279,12 @@ public IfXTableGetter(SLProtocol protocol)
 
 			public object[] RateData { get; private set; }
 
-			public bool IsSnmpAgentRestarted { get; private set; }
+			public SnmpAgentStates IsSnmpAgentRestarted { get; private set; }
 
 			public void Load()
 			{
-				IsSnmpAgentRestarted = Convert.ToBoolean(Convert.ToInt16(protocol.GetParameter(Parameter.ifxtablesnmpagentrestartflag)));
+				Enum.TryParse<SnmpAgentStates>(Convert.ToString(protocol.GetParameter(Parameter.ifxtablesnmpagentrestartflag)), out var snmpAgentRestarted);
+				IsSnmpAgentRestarted = snmpAgentRestarted;
 
 				uint[] columnsToGet = new uint[]
 				{
diff --git a/QAction_Helper/QAction_Helper.cs b/QAction_Helper/QAction_Helper.cs
@@ -65,9 +65,9 @@ public static class Parameter
 	public const int iftablesetinstance = 999;
 	/// <summary>PID: 1092 | Type: read</summary>
 	[EditorBrowsable(EditorBrowsableState.Never)]
-	public const int ifxtabletimeoutafterretriesflag_1092 = 1092;
+	public const int ifxtablegroupresultafterretries_1092 = 1092;
 	/// <summary>PID: 1092 | Type: read</summary>
-	public const int ifxtabletimeoutafterretriesflag = 1092;
+	public const int ifxtablegroupresultafterretries = 1092;
 	/// <summary>PID: 1095 | Type: read</summary>
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public const int ifxtablesnmpagentrestartflag_1095 = 1095;
@@ -1146,8 +1146,8 @@ public interface SLProtocolExt : SLProtocol
 	object Iftableifratedata { get; set; }
 	object Iftableifadminstatus_1057 { get; set; }
 	object Ifxtabletimeouttrigger_dummy { get; set; }
-	object Ifxtabletimeoutafterretriesflag_1092 { get; set; }
-	object Ifxtabletimeoutafterretriesflag { get; set; }
+	object Ifxtablegroupresultafterretries_1092 { get; set; }
+	object Ifxtablegroupresultafterretries { get; set; }
 	object Ifxtablecalculatebitrates_dummy { get; set; }
 	object Ifxtablesnmpagentrestartflag_1095 { get; set; }
 	object Ifxtablesnmpagentrestartflag { get; set; }
@@ -1487,11 +1487,11 @@ public class ConcreteSLProtocolExt : ConcreteSLProtocol, SLProtocolExt
 	public System.Object Iftableifadminstatus_1057 {get { return GetParameter(1057); }set { SetParameter(1057, value); }}
 	/// <summary>PID: 1091  | Type: dummy</summary>
 	public System.Object Ifxtabletimeouttrigger_dummy {get { return GetParameter(1091); }set { SetParameter(1091, value); }}
-	/// <summary>PID: 1092  | Type: read | DISCREETS: False = 0, True = 1</summary>
+	/// <summary>PID: 1092  | Type: read | DISCREETS: Success = 0, Timeout = 1</summary>
 	[EditorBrowsable(EditorBrowsableState.Never)]
-	public System.Object Ifxtabletimeoutafterretriesflag_1092 {get { return GetParameter(1092); }set { SetParameter(1092, value); }}
-	/// <summary>PID: 1092  | Type: read | DISCREETS: False = 0, True = 1</summary>
-	public System.Object Ifxtabletimeoutafterretriesflag {get { return GetParameter(1092); }set { SetParameter(1092, value); }}
+	public System.Object Ifxtablegroupresultafterretries_1092 {get { return GetParameter(1092); }set { SetParameter(1092, value); }}
+	/// <summary>PID: 1092  | Type: read | DISCREETS: Success = 0, Timeout = 1</summary>
+	public System.Object Ifxtablegroupresultafterretries {get { return GetParameter(1092); }set { SetParameter(1092, value); }}
 	/// <summary>PID: 1093  | Type: dummy</summary>
 	public System.Object Ifxtablecalculatebitrates_dummy {get { return GetParameter(1093); }set { SetParameter(1093, value); }}
 	/// <summary>PID: 1095  | Type: read | DISCREETS: False = 0, True = 1</summary>
diff --git a/protocol.xml b/protocol.xml
@@ -2584,8 +2584,8 @@ Currently only calculated for Ethernet interfaces.
 			<Type>dummy</Type>
 		</Param>
 		<Param id="1092">
-			<Name>ifXTableTimeoutAfterRetriesFlag</Name>
-			<Description>InterfaceX Table Timeout After Retries Flag</Description>
+			<Name>ifXTableGroupResultAfterRetries</Name>
+			<Description>Group Result After Retries - InterfaceX Table</Description>
 			<Type>read</Type>
 			<Interprete>
 				<RawType>numeric text</RawType>
@@ -2599,11 +2599,11 @@ Currently only calculated for Ethernet interfaces.
 				<Type>discreet</Type>
 				<Discreets>
 					<Discreet>
-						<Display>False</Display>
+						<Display>Success</Display>
 						<Value>0</Value>
 					</Discreet>
 					<Discreet>
-						<Display>True</Display>
+						<Display>Timeout</Display>
 						<Value>1</Value>
 					</Discreet>
 				</Discreets>

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public void ProcessData()`
`150`	`150`	`ProcessUtilization(duplexStatuses, i, key, bitrateIn, bitrateOut);`
`151`	`151`	`}`
`152`	`152`
`153`		`- if (iftableGetter.IsSnmpAgentRestarted)`
	`153`	`+ if (iftableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted)`
`154`	`154`	`{`
`155`	`155`	`iftableSetter.SetParamsData[Parameter.iftablesnmpagentrestartflag] = 0;`
`156`	`156`	`}`
`@@ -180,7 +180,7 @@ private void ProcessBitRates(SnmpDeltaHelper snmpDeltaHelper, int getPosition, o`
`180`	`180`	`string discontinuityTime = Convert.ToString(iftableGetter.Discontinuity[getPosition]);`
`181`	`181`	`bool discontinuity = Interface.HasDiscontinuity(discontinuityTime, rateData.DiscontinuityTime);`
`182`	`182`
`183`		`- if (iftableGetter.IsSnmpAgentRestarted \|\| discontinuity)`
	`183`	`+ if (iftableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted \|\| discontinuity)`
`184`	`184`	`{`
`185`	`185`	`rateData.BitrateIn = SnmpRate32.FromJsonString(String.Empty, MinDelta, MaxDelta);`
`186`	`186`	`rateData.BitrateOut = SnmpRate32.FromJsonString(String.Empty, MinDelta, MaxDelta);`
`@@ -281,12 +281,12 @@ public IfTableGetter(SLProtocol protocol)`
`281`	`281`
`282`	`282`	`public object[] RateData { get; private set; }`
`283`	`283`
`284`		`- public bool IsSnmpAgentRestarted { get; private set; }`
	`284`	`+ public SnmpAgentStates IsSnmpAgentRestarted { get; private set; }`
`285`	`285`
`286`	`286`	`public void Load()`
`287`	`287`	`{`
`288`		`- IsSnmpAgentRestarted = Convert.ToBoolean(Convert.ToInt16(protocol.GetParameter(Parameter.iftablesnmpagentrestartflag)));`
`289`		`-`
	`288`	`+ Enum.TryParse<SnmpAgentStates>(Convert.ToString(protocol.GetParameter(Parameter.iftablesnmpagentrestartflag)), out var snmpAgentState);`
	`289`	`+ IsSnmpAgentRestarted = snmpAgentState;`
`290`	`290`	`LoadIfTable();`
`291`	`291`	`LoadIfXTable();`
`292`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public void ProcessData()`
`149`	`149`	`ProcessUtilization(duplexStatuses, i, key, bitrateIn, bitrateOut);`
`150`	`150`	`}`
`151`	`151`
`152`		`- if (ifxTableGetter.IsSnmpAgentRestarted)`
	`152`	`+ if (ifxTableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted)`
`153`	`153`	`{`
`154`	`154`	`ifxTableSetter.SetParamsData[Parameter.ifxtablesnmpagentrestartflag] = 0;`
`155`	`155`	`}`
`@@ -179,7 +179,7 @@ private void ProcessBitRates(SnmpDeltaHelper snmpDeltaHelper, int getPosition, o`
`179`	`179`	`string discontinuityTime = Convert.ToString(ifxTableGetter.Discontinuity[getPosition]);`
`180`	`180`	`bool discontinuity = Interface.HasDiscontinuity(discontinuityTime, rateData.DiscontinuityTime);`
`181`	`181`
`182`		`- if (ifxTableGetter.IsSnmpAgentRestarted \|\| discontinuity)`
	`182`	`+ if (ifxTableGetter.IsSnmpAgentRestarted == SnmpAgentStates.Restarted \|\| discontinuity)`
`183`	`183`	`{`
`184`	`184`	`rateData.BitrateIn = SnmpRate64.FromJsonString(String.Empty, MinDelta, MaxDelta);`
`185`	`185`	`rateData.BitrateOut = SnmpRate64.FromJsonString(String.Empty, MinDelta, MaxDelta);`
`@@ -279,11 +279,12 @@ public IfXTableGetter(SLProtocol protocol)`
`279`	`279`
`280`	`280`	`public object[] RateData { get; private set; }`
`281`	`281`
`282`		`- public bool IsSnmpAgentRestarted { get; private set; }`
	`282`	`+ public SnmpAgentStates IsSnmpAgentRestarted { get; private set; }`
`283`	`283`
`284`	`284`	`public void Load()`
`285`	`285`	`{`
`286`		`- IsSnmpAgentRestarted = Convert.ToBoolean(Convert.ToInt16(protocol.GetParameter(Parameter.ifxtablesnmpagentrestartflag)));`
	`286`	`+ Enum.TryParse<SnmpAgentStates>(Convert.ToString(protocol.GetParameter(Parameter.ifxtablesnmpagentrestartflag)), out var snmpAgentRestarted);`
	`287`	`+ IsSnmpAgentRestarted = snmpAgentRestarted;`
`287`	`288`
`288`	`289`	`uint[] columnsToGet = new uint[]`
`289`	`290`	`{`