updates to Siemens.WebAPI... v2.2.14 + fixies for fw3.1

Inxton · Jan 27, 2024 · ad3cb68 · ad3cb68
1 parent 020d382
commit ad3cb68
Show file tree

Hide file tree

Showing 14 changed files with 115 additions and 80 deletions.
diff --git a/src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/WebApiConnector.cs b/src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/WebApiConnector.cs
@@ -94,7 +94,7 @@ public WebApiConnector(string ipAddress, string userName, string password, bool
             new ApiRequestFactory(ReqIdGenerator, RequestParameterChecker), ApiResponseChecker);
 
         requestHandler.ApiLogout();
-        requestHandler.ApiLogin(userName, string.Empty, true);
+        requestHandler.ApiLogin(userName, password, true);
 
         NumberOfInstances++;
     }

diff --git a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/Exploratory.cs b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/Exploratory.cs
@@ -36,7 +36,7 @@ public async void should_read_huge()
 #if RELEASE
     return;
 #endif
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
 
 
             var myBOOL = new WebApiBool(connector, "", "myBOOL");
@@ -156,7 +156,7 @@ public async Task should_write_huge()
 #if RELEASE
     return;
 #endif
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
 
 
 

diff --git a/...onnectors/tests/AXSharp.Connector.Sax.WebAPITests/WebApiConnector/WebApiConnectorTests.cs b/...onnectors/tests/AXSharp.Connector.Sax.WebAPITests/WebApiConnector/WebApiConnectorTests.cs
@@ -43,7 +43,7 @@ public WebApiConnectorTests(ITestOutputHelper output)
         [Fact]
         public async Task should_write_bool()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true).BuildAndStart() as WebApiConnector;
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true).BuildAndStart() as WebApiConnector;
             //await connector.Authenticate(TargetIp, "Everybody", "");
             var myBOOL = new WebApiBool(connector, "", "myBOOL");
             var actual = await connector.WriteAsync<bool>(myBOOL, true);
@@ -54,7 +54,7 @@ public async Task should_write_bool()
         [Fact]
         public async Task should_read_bool()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             var myBOOL = new WebApiBool(connector, "", "myBOOL");
             await connector.WriteAsync<bool>(myBOOL, true);
             var response = await connector.ReadAsync<bool>("myBOOL");
@@ -65,7 +65,7 @@ public async Task should_read_bool()
         [Fact]
         public async Task should_write_byte()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             var myBYTE = new WebApiByte(connector, "", "myBYTE");
             var actual = await connector.WriteAsync<byte>(myBYTE, 155);
 
@@ -75,7 +75,7 @@ public async Task should_write_byte()
         [Fact]
         public async Task should_read_byte()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             var myBYTE = new WebApiByte(connector, "", "myBYTE");
             await connector.WriteAsync<byte>(myBYTE, 158);
             var response = await connector.ReadAsync<byte>("myBYTE");
@@ -86,7 +86,7 @@ public async Task should_read_byte()
         [Fact]
         public async Task should_read_lint()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             var myLINT = new WebApiLInt(connector, "", "myLINT");
             await connector.WriteAsync<long>(myLINT, 9223372036854775807);
 
@@ -98,7 +98,7 @@ public async Task should_read_lint()
         [Fact]
         public async Task should_batch_read_primitives()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
 
 
             var myBOOL = new WebApiBool(connector, "", "myBOOL");
@@ -181,7 +181,7 @@ public async Task should_batch_read_primitives()
         [Fact]
         public async Task should_batch_write_primitives()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
 
 
 
@@ -900,7 +900,7 @@ public async Task should_batch_read_a_lot_of_primitives()
 #if RELEASE
     return;
 #endif
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
 
 
 
@@ -1772,7 +1772,7 @@ public async Task should_batch_read_a_lot_of_primitives()
         [Fact]
         public async Task should_report_failure_when_unable_to_read_single_item()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             connector.ExceptionBehaviour = CommExceptionBehaviour.Ignore;
             var myBYTE = new WebApiByte(connector, "", "myBYTE_does_not_exist");
             var response = await connector.ReadAsync<byte>(myBYTE);
@@ -1785,7 +1785,7 @@ public async Task should_report_failure_when_unable_to_read_single_item()
         [Fact]
         public async Task should_report_failure_when_unable_to_write_single_item()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             connector.ExceptionBehaviour = CommExceptionBehaviour.Ignore;
             var myBYTE = new WebApiByte(connector, "", "myBYTE_does_not_exist");
             var response = await connector.WriteAsync<byte>(myBYTE,55);
@@ -1800,7 +1800,7 @@ public async Task should_report_failure_when_unable_to_write_single_item()
         [Fact]
         public async Task should_report_failure_when_unable_to_bulk_read_items()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             connector.ExceptionBehaviour = CommExceptionBehaviour.Ignore;
             var myBYTE = new WebApiByte(connector, "", "myBYTE_o");
             var myWORD = new WebApiWord(connector, "", "myWORD");
@@ -1823,7 +1823,7 @@ public async Task should_report_failure_when_unable_to_bulk_read_items()
         [Fact]
         public async Task should_report_failure_when_unable_to_bulk_write_items()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             connector.ExceptionBehaviour = CommExceptionBehaviour.Ignore;
             var myBYTE = new WebApiByte(connector, "", "myBYTE_o");
             var myWORD = new WebApiWord(connector, "", "myWORD");
@@ -1847,7 +1847,7 @@ public async Task should_report_failure_when_unable_to_bulk_write_items()
         [Fact]
         public void should_rethrow_exception_bulk()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             connector.ExceptionBehaviour = CommExceptionBehaviour.ReThrow;
             var myBYTE = new WebApiByte(connector, "", "myBYTE_o");
             var myWORD = new WebApiWord(connector, "", "myWORD");
@@ -1868,7 +1868,7 @@ public void should_rethrow_exception_bulk()
         [Fact]
         public void should_rethrow_exception_single()
         {
-            var connector = new WebApiConnector(TargetIp, "Everybody", "", true);
+            var connector = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true);
             connector.ExceptionBehaviour = CommExceptionBehaviour.ReThrow;
             var myBYTE = new WebApiByte(connector, "", "myBYTE_o");
 

diff --git a/...onnectors/tests/AXSharp.Connector.Sax.WebAPITests/WebApiConnector/WebApiPrimitiveTests.cs b/...onnectors/tests/AXSharp.Connector.Sax.WebAPITests/WebApiConnector/WebApiPrimitiveTests.cs
@@ -22,7 +22,7 @@ public static class TestConnector
     {
         private static string TargetIp { get; } = Environment.GetEnvironmentVariable("AX_WEBAPI_TARGET") ?? "10.10.101.1";
 
-        public static WebApiConnector TestApiConnector { get; } = new WebApiConnector(TargetIp, "Everybody", "", true).BuildAndStart() as WebApiConnector;
+        public static WebApiConnector TestApiConnector { get; } = new WebApiConnector(TargetIp, "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true).BuildAndStart() as WebApiConnector;
     }
 
     public abstract class WebApiPrimitiveTests<T, N> where T : OnlinerBase<N>, new()

diff --git a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/issues/GH_PTKu_ix_56.cs b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/issues/GH_PTKu_ix_56.cs
@@ -80,7 +80,7 @@ public async Task reproduction_no_base()
         public async Task run_on_twin_connector()
         {
             var twin = new ax_test_projectTwinController(ConnectorAdapterBuilder.Build()
-                .CreateWebApi(Environment.GetEnvironmentVariable("AX_WEBAPI_TARGET"), "Everybody", "", true));
+                .CreateWebApi(Environment.GetEnvironmentVariable("AX_WEBAPI_TARGET"), "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true));
 
             var primitives = twin.GH_PKTu_ix_56_SecondInheritance.RetrievePrimitives().Select(p => p.Symbol).ToList();
 

diff --git a/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/issues/GH_PTKu_ix_xx.cs b/src/AXSharp.connectors/tests/AXSharp.Connector.Sax.WebAPITests/issues/GH_PTKu_ix_xx.cs
@@ -23,7 +23,7 @@ public class GH_PTKu_ix_xx : IDisposable
     public GH_PTKu_ix_xx(ITestOutputHelper output)
     {
         Plc = new ax_test_projectTwinController(ConnectorAdapterBuilder.Build()
-            .CreateWebApi(Environment.GetEnvironmentVariable("AX_WEBAPI_TARGET"), "Everybody", "", true));
+            .CreateWebApi(Environment.GetEnvironmentVariable("AX_WEBAPI_TARGET"), "Everybody", Environment.GetEnvironmentVariable("AX_TARGET_PWD"), true));
         Plc.Connector.ReadWriteCycleDelay = 250;
         Plc.Connector.ExceptionBehaviour = CommExceptionBehaviour.ReThrow;
         Plc.Connector.SubscriptionMode = ReadSubscriptionMode.Polling;

diff --git a/src/AXSharp.connectors/tests/AXSharp.TIA.ConnectorTests/TIA2AXSharpAdapterTests.cs b/src/AXSharp.connectors/tests/AXSharp.TIA.ConnectorTests/TIA2AXSharpAdapterTests.cs
@@ -35,7 +35,7 @@ public TIA2AXSharpAdapterTests(ITestOutputHelper output)
         public async void GoAxTest()
         {
 
-            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, string.Empty);
+            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, dbName:string.Empty);
             //var connector = new WebApiConnector("172.20.30.110", "Everybody", "", true, string.Empty);
             var adapter = await TIA2AXSharpAdapter.CreateAdapter(connector);
 
@@ -67,7 +67,7 @@ public async void GoAxTest()
         public async void GoTiaPortalDbData()
         {
 
-            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, string.Empty);
+            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, dbName:string.Empty);
 
             //var rootObject = await TIA2AXSharpAdapter.CreateTIARootObject(connector, new[] { "DbData" });
             //TIA2AXSharpSerializer.Serialize(rootObject, "dbData.json");
@@ -98,7 +98,7 @@ public async void GoTiaPortalDbData()
         public async void GoTiaPortalDbDataFromParamTest()
         {
 
-            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, string.Empty);
+            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, dbName:string.Empty);
 
 
             var adapter = await TIA2AXSharpAdapter.CreateAdapter(connector, "dbData.json");
@@ -124,7 +124,7 @@ public async void GoTiaPortalDbDataFromParamTest()
         public async void GoAdapterWithSerializationTest()
         {
 
-            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, string.Empty);
+            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, dbName:string.Empty);
             var rootObject = await TIA2AXSharpAdapter.CreateTIARootObject(connector, new[] { "dbtest" });
             TIA2AXSharpSerializer.Serialize(rootObject, "test.json");
 
@@ -149,7 +149,7 @@ public async void GoAdapterWithSerializationTest()
         public async void GoAdapterFromDeSerializedTest()
         {
 
-            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, string.Empty);
+            var connector = new WebApiConnector("10.10.10.180", "Everybody", "", true, dbName:string.Empty);
 
 
             var rootObject = TIA2AXSharpSerializer.Deserialize("test.json");

diff --git a/src/AXSharp.tools/src/AXSharp.TIA2AX.TranformerTests/AXPseoudoProjectGeneratorTests.cs b/src/AXSharp.tools/src/AXSharp.TIA2AX.TranformerTests/AXPseoudoProjectGeneratorTests.cs
@@ -16,7 +16,9 @@ public class AXPseoudoProjectGeneratorTests
         public void CreateTest()
         {
             var assemblyLocation = new FileInfo(Assembly.GetExecutingAssembly().Location);
-            AXPseoudoProjectGenerator.Create(assemblyLocation.DirectoryName, "output", new string[] { Path.Combine(assemblyLocation.DirectoryName, "samples", "ExportViacDbBezInstancneho.db") });
+            AXPseoudoProjectGenerator.Create(assemblyLocation.DirectoryName, 
+               "output", 
+               new string[] { Path.Combine(assemblyLocation.DirectoryName, "samples", "ExportViacDbBezInstancneho.db") }, new Options());
 
             var expectedConfiguration = @"CONFIGURATION MyConfiguration
 TASK Main(Interval := T#10ms, Priority := 1);

diff --git a/src/AXSharp.tools/src/AXSharp.TIA2AXTool/Program.cs b/src/AXSharp.tools/src/AXSharp.TIA2AXTool/Program.cs
@@ -49,7 +49,7 @@ void Main(Options o)
 
     Stopwatch sw = new Stopwatch();
     sw.Start();
-    var connector = new WebApiConnector(o.Ip, o.Username, o.Password, true, string.Empty);
+    var connector = new WebApiConnector(o.Ip, o.Username, o.Password, true, dbName:string.Empty);
     Console.WriteLine("Connected.");
     Console.WriteLine("Generating...");
 

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -7,77 +7,50 @@
   <ItemGroup>
     <GlobalPackageReference Include="GitVersion.MsBuild" Version="5.10.3">
       <PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </GlobalPackageReference>
-
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.2" />
-
-
-    <PackageVersion Include="CliWrap" Version="3.6.0"/>		
-		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
-		<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
-		<PackageVersion Include="NuGet.Configuration" Version="6.3.1" />
-		<PackageVersion Include="NuGet.Packaging" Version="6.3.1" />
-		<PackageVersion Include="Polly" Version="7.2.4" />
-		<PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
-		<PackageVersion Include="YamlDotNet" Version="13.0.0" />
-
+    <PackageVersion Include="CliWrap" Version="3.6.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />    
+    <PackageVersion Include="NuGet.Configuration" Version="6.3.1" />
+    <PackageVersion Include="NuGet.Packaging" Version="6.3.1" />
+    <PackageVersion Include="Polly" Version="7.2.4" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageVersion Include="YamlDotNet" Version="13.0.0" />
     <PackageVersion Include="Irony" Version="1.2.0" />
-		<PackageVersion Include="Irony.Interpreter" Version="1.2.0" />
-
+    <PackageVersion Include="Irony.Interpreter" Version="1.2.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-
     <PackageVersion Include="LibGit2Sharp" Version="0.27.2" />
-		<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
-		<PackageVersion Include="YamlDotNet" Version="13.0.0" />
-
-
-    <PackageVersion Include="coverlet.collector" Version="3.2.0"/>
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="YamlDotNet" Version="13.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
     <PackageVersion Include="bunit" Version="1.11.7" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5"/>
-
-
-
-		<PackageVersion Include="ResXResourceReader.NetStandard" Version="1.1.0" />		
-
-	  <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2"/>
-		<PackageVersion Include="NSubstitute" Version="5.0.0"/>
-		<PackageVersion Include="xunit" Version="2.4.2"/>
-		<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5"/>					
-		<PackageVersion Include="coverlet.collector" Version="3.2.0"/>					
-
-    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />						
-		<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
-
-
-
-
-
-		<PackageVersion Include="Siemens.Simatic.S7.Webserver.API" Version="2.1.4" />
-
-
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="ResXResourceReader.NetStandard" Version="1.1.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageVersion Include="NSubstitute" Version="5.0.0" />
+    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
+    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Siemens.Simatic.S7.Webserver.API" Version="2.2.14" />
     <PackageVersion Include="nunit" Version="3.13.3" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />      
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageVersion Include="NSubstitute" Version="5.0.0" />
-    <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.15"/>      
-
+    <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.15" />
     <PackageVersion Include="AutoFixture" Version="4.17.0" />
-    <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.17.0" />        
+    <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.17.0" />
     <PackageVersion Include="FluentAssertions" Version="6.8.0" />
-
-
     <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
-
-    <PackageVersion Include="Moq" Version="4.18.2" />                  
-
+    <PackageVersion Include="Moq" Version="4.18.2" />
     <PackageVersion Include="System.Speech" Version="7.0.0" />
     <PackageVersion Include="System.Interactive" Version="6.0.1" />
-
     <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.2" />