Merge re/r1.10-rename-tags: RenameTagsAsync via History StartJob
# Conflicts: # docs/plans/hcal-capability-matrix.md # docs/plans/hcal-roadmap.md # src/AVEVA.Historian.Client/Wcf/HistorianWcfTagWriteOrchestrator.cs # tests/AVEVA.Historian.Client.Tests/HistorianClientIntegrationTests.cs # tools/AVEVA.Historian.NativeTraceHarness/Program.cs
This commit is contained in:
@@ -505,6 +505,14 @@ internal static class Program
|
||||
}));
|
||||
return 0;
|
||||
}
|
||||
SetProperty(connectionArgs, "ReadOnly", !(IsWriteScenario(scenario) || IsRenameScenario(scenario)));
|
||||
SetProperty(connectionArgs, "IntegratedSecurity", integratedSecurity);
|
||||
SetProperty(connectionArgs, "ConnectionType", Enum.Parse(connectionType, IsEventScenario(scenario) ? "Event" : "Process"));
|
||||
if (directConnection)
|
||||
{
|
||||
SetProperty(connectionArgs, "DirectConnection", true);
|
||||
SetField(connectionArgs, "directConnection", true);
|
||||
}
|
||||
else if (openSuccess && status.ConnectedToServer && IsEventSendScenario(scenario))
|
||||
{
|
||||
// R2.1 capture: drive AddStreamedValue(HistorianEvent) and let instrument-wcf-*
|
||||
@@ -1768,6 +1776,13 @@ internal static class Program
|
||||
return ex.GetType().Name + ": " + ex.Message;
|
||||
}
|
||||
|
||||
private static bool IsRenameScenario(string scenario)
|
||||
{
|
||||
return scenario.Equals("rename", StringComparison.OrdinalIgnoreCase)
|
||||
|| scenario.Equals("rename-tag", StringComparison.OrdinalIgnoreCase)
|
||||
|| scenario.Equals("rename-tags", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
private static bool IsEventScenario(string scenario)
|
||||
{
|
||||
return scenario.Equals("event", StringComparison.OrdinalIgnoreCase)
|
||||
|
||||
Reference in New Issue
Block a user