Skip to content

Commit af56205

Browse files
SimonV-SkylineSimonV-Skyline
committed
Updated to new NuGet version, mainly to fix the api arg name from groupId to tablePid
Change-Id: Ia08dd3b56a0da1aa0226a3e3957b4463e10e7204
1 parent bfd5ebd commit af56205

15 files changed

+36
-30
lines changed

‎QAction_1/ProtocolExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static void SetColumns(this SLProtocol protocol, Dictionary<object, List<
4141
if (setColumnsData.ElementAt(i).Value.Count != rowCount)
4242
{
4343
protocol.Log(
44-
"QA" + protocol.QActionID + "|SetColumns|SetColumns on table '" + setColumnsData.Keys.ToArray()[0] + "' failed. Not all columns contain the same number of rows.",
44+
$"QA{protocol.QActionID}|SetColumns|SetColumns on table '{setColumnsData.Keys.ToArray()[0]}' failed. Not all columns contain the same number of rows.",
4545
LogType.Error,
4646
LogLevel.NoLogging);
4747

‎QAction_1/QAction_1.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<Version>10.1.0.6</Version>
6363
</PackageReference>
6464
<PackageReference Include="Skyline.DataMiner.Utils.Rates.Protocol">
65-
<Version>1.0.0.1</Version>
65+
<Version>1.0.0.2</Version>
6666
</PackageReference>
6767
<PackageReference Include="StyleCop.Analyzers">
6868
<Version>1.1.118</Version>
@@ -73,7 +73,7 @@
7373
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7474
<ProjectExtensions>
7575
<VisualStudio>
76-
<UserProperties DisLinkedXmlFile="..\protocol.xml" DisProjectType="qactionProject" DisLinkId="1" />
76+
<UserProperties DisLinkId="1" DisProjectType="qactionProject" DisLinkedXmlFile="..\protocol.xml" />
7777
</VisualStudio>
7878
</ProjectExtensions>
7979
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎QAction_1000/QAction_1000.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void ProcessTable(SLProtocol protocol)
2222
}
2323
catch (Exception ex)
2424
{
25-
protocol.Log("QA" + protocol.QActionID + "|ProcessSuccess|Error: " + ex, LogType.Error, LogLevel.NoLogging);
25+
protocol.Log($"QA{protocol.QActionID}|ProcessSuccess|Error: {ex}", LogType.Error, LogLevel.NoLogging);
2626
ProcessTimeout(protocol);
2727
}
2828
}
@@ -41,7 +41,7 @@ public static void ProcessTimeout(SLProtocol protocol)
4141
}
4242
catch (Exception ex)
4343
{
44-
protocol.Log("QA" + protocol.QActionID + "|ProcessTimeout|Error: " + ex, LogType.Error, LogLevel.NoLogging);
44+
protocol.Log($"QA{protocol.QActionID}|ProcessTimeout|Error: {ex}", LogType.Error, LogLevel.NoLogging);
4545
}
4646
}
4747
}

‎QAction_1000/QAction_1000.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Version>1.0.0.1</Version>
6868
</PackageReference>
6969
<PackageReference Include="Skyline.DataMiner.Utils.Rates.Protocol">
70-
<Version>1.0.0.1</Version>
70+
<Version>1.0.0.2</Version>
7171
</PackageReference>
7272
<PackageReference Include="Skyline.DataMiner.Utils.SafeConverters">
7373
<Version>1.0.0.1</Version>
@@ -81,7 +81,7 @@
8181
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8282
<ProjectExtensions>
8383
<VisualStudio>
84-
<UserProperties DisLinkedXmlFile="..\protocol.xml" DisProjectType="qactionProject" DisLinkId="1000" />
84+
<UserProperties DisLinkId="1000" DisProjectType="qactionProject" DisLinkedXmlFile="..\protocol.xml" />
8585
</VisualStudio>
8686
</ProjectExtensions>
8787
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎QAction_1100/QAction_1100.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void ProcessTable(SLProtocol protocol)
2222
}
2323
catch (Exception ex)
2424
{
25-
protocol.Log("QA" + protocol.QActionID + "|ProcessSuccess|Error: " + ex, LogType.Error, LogLevel.NoLogging);
25+
protocol.Log($"QA{protocol.QActionID}|ProcessSuccess|Error: {ex}", LogType.Error, LogLevel.NoLogging);
2626
ProcessTimeout(protocol);
2727
}
2828
}
@@ -41,7 +41,7 @@ public static void ProcessTimeout(SLProtocol protocol)
4141
}
4242
catch (Exception ex)
4343
{
44-
protocol.Log("QA" + protocol.QActionID + "|ProcessTimeout|Error: " + ex, LogType.Error, LogLevel.NoLogging);
44+
protocol.Log($"QA{protocol.QActionID}|ProcessTimeout|Error: {ex}", LogType.Error, LogLevel.NoLogging);
4545
}
4646
}
4747
}

‎QAction_1100/QAction_1100.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Version>1.0.0.1</Version>
6868
</PackageReference>
6969
<PackageReference Include="Skyline.DataMiner.Utils.Rates.Protocol">
70-
<Version>1.0.0.1</Version>
70+
<Version>1.0.0.2</Version>
7171
</PackageReference>
7272
<PackageReference Include="Skyline.DataMiner.Utils.SafeConverters">
7373
<Version>1.0.0.1</Version>
@@ -81,7 +81,7 @@
8181
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8282
<ProjectExtensions>
8383
<VisualStudio>
84-
<UserProperties DisLinkedXmlFile="..\protocol.xml" DisProjectType="qactionProject" DisLinkId="1100" />
84+
<UserProperties DisLinkId="1100" DisProjectType="qactionProject" DisLinkedXmlFile="..\protocol.xml" />
8585
</VisualStudio>
8686
</ProjectExtensions>
8787
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎QAction_1191/QAction_1191.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void Run(SLProtocolExt protocol)
6868
}
6969
catch (Exception ex)
7070
{
71-
protocol.Log("QA" + protocol.QActionID + "|Run|Error: " + ex, LogType.Error, LogLevel.NoLogging);
71+
protocol.Log($"QA{protocol.QActionID}|Run|Error: {ex}", LogType.Error, LogLevel.NoLogging);
7272
}
7373
}
7474

‎QAction_1192/QAction_1192.cs

+8-4
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ public static void Run(SLProtocol protocol)
1616
{
1717
try
1818
{
19-
CalculationMethod rateCalculationsMethod = (CalculationMethod)Convert.ToInt32(protocol.GetParameter(Parameter.interfacesratecalculationsmethod));
20-
SnmpDeltaHelper.UpdateRateDeltaTracking(protocol, groupId: 1000, rateCalculationsMethod);
21-
SnmpDeltaHelper.UpdateRateDeltaTracking(protocol, groupId: 1100, rateCalculationsMethod);
19+
CalculationMethod rateCalculationsMethod =
20+
(CalculationMethod)Convert.ToInt32(protocol.GetParameter(Parameter.interfacesratecalculationsmethod));
21+
22+
SnmpDeltaHelper.UpdateRateDeltaTracking(
23+
protocol,
24+
tablePids: new[] { 1000, 1100 },
25+
rateCalculationsMethod);
2226
}
2327
catch (Exception ex)
2428
{
25-
protocol.Log("QA" + protocol.QActionID + "|" + protocol.GetTriggerParameter() + "|Run|Exception thrown:" + Environment.NewLine + ex, LogType.Error, LogLevel.NoLogging);
29+
protocol.Log($"QA{protocol.QActionID}|{protocol.GetTriggerParameter()}|Run|Exception thrown:{Environment.NewLine}{ex}", LogType.Error, LogLevel.NoLogging);
2630
}
2731
}
2832
}

‎QAction_1192/QAction_1192.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<Version>10.1.0.6</Version>
5757
</PackageReference>
5858
<PackageReference Include="Skyline.DataMiner.Utils.SNMP">
59-
<Version>1.0.0.1</Version>
59+
<Version>1.0.0.2</Version>
6060
</PackageReference>
6161
<PackageReference Include="StyleCop.Analyzers">
6262
<Version>1.1.118</Version>
@@ -67,7 +67,7 @@
6767
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6868
<ProjectExtensions>
6969
<VisualStudio>
70-
<UserProperties DisLinkedXmlFile="..\protocol.xml" DisProjectType="qactionProject" DisLinkId="1192" />
70+
<UserProperties DisLinkId="1192" DisProjectType="qactionProject" DisLinkedXmlFile="..\protocol.xml" />
7171
</VisualStudio>
7272
</ProjectExtensions>
7373
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎QAction_1257/QAction_1257.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void Run(SLProtocol protocol)
6161

6262
default:
6363
protocol.Log(
64-
"QA" + protocol.QActionID + "|Run|QAction triggered by unexpected param '" + triggerPid + "'",
64+
$"QA{protocol.QActionID}|Run|QAction triggered by unexpected param '{triggerPid}'",
6565
LogType.Error,
6666
LogLevel.NoLogging);
6767
break;
@@ -71,7 +71,7 @@ public static void Run(SLProtocol protocol)
7171
}
7272
catch (Exception ex)
7373
{
74-
protocol.Log("QA" + protocol.QActionID + "|Run|Error: " + ex, LogType.Error, LogLevel.NoLogging);
74+
protocol.Log($"QA{protocol.QActionID}|Run|Error: {ex}", LogType.Error, LogLevel.NoLogging);
7575
}
7676
}
7777
}

‎QAction_2/QAction_2.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ public static void Run(SLProtocol protocol)
2020
CalculationMethod rateCalculationsMethod = (CalculationMethod)Convert.ToInt32(protocol.GetParameter(Parameter.interfacesratecalculationsmethod));
2121
if (rateCalculationsMethod == CalculationMethod.Accurate)
2222
{
23-
SnmpDeltaHelper.UpdateRateDeltaTracking(protocol, groupId: 1000, CalculationMethod.Accurate);
24-
SnmpDeltaHelper.UpdateRateDeltaTracking(protocol, groupId: 1100, CalculationMethod.Accurate);
23+
SnmpDeltaHelper.UpdateRateDeltaTracking(
24+
protocol,
25+
tablePids: new[] { 1000, 1100 },
26+
CalculationMethod.Accurate);
2527
}
2628
}
2729
catch (Exception ex)
2830
{
29-
protocol.Log("QA" + protocol.QActionID + "|" + protocol.GetTriggerParameter() + "|Run|Exception thrown:" + Environment.NewLine + ex, LogType.Error, LogLevel.NoLogging);
31+
protocol.Log($"QA{protocol.QActionID}|{protocol.GetTriggerParameter()}|Run|Exception thrown:{Environment.NewLine}{ex}", LogType.Error, LogLevel.NoLogging);
3032
}
3133
}
3234
}

‎QAction_2/QAction_2.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<Version>10.1.0.6</Version>
5858
</PackageReference>
5959
<PackageReference Include="Skyline.DataMiner.Utils.SNMP">
60-
<Version>1.0.0.1</Version>
60+
<Version>1.0.0.2</Version>
6161
</PackageReference>
6262
<PackageReference Include="StyleCop.Analyzers">
6363
<Version>1.1.118</Version>
@@ -68,7 +68,7 @@
6868
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6969
<ProjectExtensions>
7070
<VisualStudio>
71-
<UserProperties DisLinkId="2" DisProjectType="qactionProject" DisLinkedXmlFile="..\protocol.xml" />
71+
<UserProperties DisLinkedXmlFile="..\protocol.xml" DisProjectType="qactionProject" DisLinkId="2" />
7272
</VisualStudio>
7373
</ProjectExtensions>
7474
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎QAction_91/QAction_91.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static void ProcessTimeout(SLProtocol protocol)
3333
}
3434
catch (Exception ex)
3535
{
36-
protocol.Log("QA" + protocol.QActionID + "|" + protocol.GetTriggerParameter() + "|Run|Exception thrown:" + Environment.NewLine + ex, LogType.Error, LogLevel.NoLogging);
36+
protocol.Log($"QA{protocol.QActionID}|{protocol.GetTriggerParameter()}|Run|Exception thrown:{Environment.NewLine}{ex}", LogType.Error, LogLevel.NoLogging);
3737
}
3838
}
3939

@@ -65,7 +65,7 @@ public static void ProcessNewValue(SLProtocol protocol)
6565
}
6666
catch (Exception ex)
6767
{
68-
protocol.Log("QA" + protocol.QActionID + "|" + protocol.GetTriggerParameter() + "|Run|Exception thrown:" + Environment.NewLine + ex, LogType.Error, LogLevel.NoLogging);
68+
protocol.Log($"QA{protocol.QActionID}|{protocol.GetTriggerParameter()}|Run|Exception thrown:{Environment.NewLine}{ex}", LogType.Error, LogLevel.NoLogging);
6969
}
7070
}
7171
}

‎QAction_91/QAction_91.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<Version>10.1.0.6</Version>
5757
</PackageReference>
5858
<PackageReference Include="Skyline.DataMiner.Utils.SNMP">
59-
<Version>1.0.0.1</Version>
59+
<Version>1.0.0.2</Version>
6060
</PackageReference>
6161
<PackageReference Include="StyleCop.Analyzers">
6262
<Version>1.1.118</Version>
@@ -67,7 +67,7 @@
6767
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6868
<ProjectExtensions>
6969
<VisualStudio>
70-
<UserProperties DisLinkedXmlFile="..\protocol.xml" DisProjectType="qactionProject" DisLinkId="91" />
70+
<UserProperties DisLinkId="91" DisProjectType="qactionProject" DisLinkedXmlFile="..\protocol.xml" />
7171
</VisualStudio>
7272
</ProjectExtensions>
7373
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎protocol.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
44
****************************************************************************
5-
* Copyright (c) 2022, Skyline Communications NV All Rights Reserved. *
5+
* Copyright (c) 2023, Skyline Communications NV All Rights Reserved. *
66
****************************************************************************
77
88
By using this driver, you expressly agree with the usage terms and

0 commit comments

Comments
 (0)