From f70c3596db9bb9389b7238777903e07ac20be00d Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Thu, 21 Apr 2022 23:58:03 +0200 Subject: [PATCH] Changed API --- FabAccessAPI/schema | 2 +- FabAccessAPI_Test/API_TestEnv_Test.cs | 127 ++++++++++---------------- 2 files changed, 48 insertions(+), 81 deletions(-) diff --git a/FabAccessAPI/schema b/FabAccessAPI/schema index c9283eb..557f37b 160000 --- a/FabAccessAPI/schema +++ b/FabAccessAPI/schema @@ -1 +1 @@ -Subproject commit c9283ebd696ed6dd428a7c3d24820889f7ab4bf3 +Subproject commit 557f37b7cf7d7f06f27e8bddb0c45ce1153e2d06 diff --git a/FabAccessAPI_Test/API_TestEnv_Test.cs b/FabAccessAPI_Test/API_TestEnv_Test.cs index fb81cbb..0dbaa09 100644 --- a/FabAccessAPI_Test/API_TestEnv_Test.cs +++ b/FabAccessAPI_Test/API_TestEnv_Test.cs @@ -96,7 +96,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - bool result = !((MachineSystem_Proxy)session.MachineSystem).IsNull; + bool result = session.MachineSystem != null; API_TestEnv_Test.Disconnect(connection); @@ -134,8 +134,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - IReadOnlyList machine_list = await infoInterface.GetMachineList().ConfigureAwait(false); + IReadOnlyList machine_list = await session.MachineSystem.Info.GetMachineList().ConfigureAwait(false); int result = machine_list.Count; @@ -175,8 +174,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineName).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineName).ConfigureAwait(false); bool result = machine != null; API_TestEnv_Test.Disconnect(connection); @@ -192,8 +190,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineName).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineName).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection); @@ -231,8 +228,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(urn).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(urn).ConfigureAwait(false); bool result = machine != null; API_TestEnv_Test.Disconnect(connection); @@ -249,8 +245,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(urn).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(urn).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection); @@ -292,8 +287,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); bool result = !((Machine.InfoInterface_Proxy)machine.Info).IsNull; @@ -332,8 +326,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); bool result = !((ManageInterface_Proxy)machine.Manage).IsNull; @@ -372,8 +365,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); bool result = !((AdminInterface_Proxy)machine.Admin).IsNull; @@ -391,8 +383,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection); @@ -417,8 +408,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine.Manage.ForceFree().ConfigureAwait(false); @@ -462,8 +452,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - MachineSystem.IInfoInterface infoInterface = await session.MachineSystem.Info().ConfigureAwait(false); - Machine machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + Machine machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); // Check State before run Test if (machine.State != MachineState.free) @@ -474,10 +463,10 @@ namespace FabAccessAPI_Test await machine.Use.Use().ConfigureAwait(false); - machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine.Inuse.GiveBack().ConfigureAwait(false); - machine = await infoInterface.GetMachine(machineID).ConfigureAwait(false); + machine = await session.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection); @@ -496,10 +485,7 @@ namespace FabAccessAPI_Test Connection connection2 = await API_TestEnv_Test.Connect(username2); Session session2 = connection1.Session; - MachineSystem.IInfoInterface infoInterface1 = await session1.MachineSystem.Info().ConfigureAwait(false); - MachineSystem.IInfoInterface infoInterface2 = await session2.MachineSystem.Info().ConfigureAwait(false); - - Machine machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + Machine machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); // Check State before run Test if (machine1.State != MachineState.free) @@ -510,16 +496,16 @@ namespace FabAccessAPI_Test } await machine1.Use.Use().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine1.Inuse.Releasefortakeover().ConfigureAwait(false); - Machine machine2 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + Machine machine2 = await session2.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine2.Takeover.Accept().ConfigureAwait(false); - machine2 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + machine2 = await session2.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine2.Inuse.GiveBack().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection1); API_TestEnv_Test.Disconnect(connection2); @@ -539,10 +525,7 @@ namespace FabAccessAPI_Test Connection connection2 = await API_TestEnv_Test.Connect(username2); Session session2 = connection1.Session; - MachineSystem.IInfoInterface infoInterface1 = await session1.MachineSystem.Info().ConfigureAwait(false); - MachineSystem.IInfoInterface infoInterface2 = await session2.MachineSystem.Info().ConfigureAwait(false); - - Machine machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + Machine machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); // Check State before run Test if (machine1.State != MachineState.free) @@ -553,16 +536,16 @@ namespace FabAccessAPI_Test } await machine1.Use.Use().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine1.Inuse.Releasefortakeover().ConfigureAwait(false); - Machine machine2 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + Machine machine2 = await session2.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine2.Takeover.Reject().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine1.Inuse.GiveBack().ConfigureAwait(false); - machine2 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine2 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection1); API_TestEnv_Test.Disconnect(connection2); @@ -582,10 +565,7 @@ namespace FabAccessAPI_Test Connection connection2 = await API_TestEnv_Test.Connect(username2); Session session2 = connection1.Session; - MachineSystem.IInfoInterface infoInterface1 = await session1.MachineSystem.Info().ConfigureAwait(false); - MachineSystem.IInfoInterface infoInterface2 = await session2.MachineSystem.Info().ConfigureAwait(false); - - Machine machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + Machine machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); // Check State before run Test if (machine1.State != MachineState.free) @@ -596,13 +576,13 @@ namespace FabAccessAPI_Test } await machine1.Use.Use().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine1.Inuse.GiveBack().ConfigureAwait(false); - Machine machine2 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + Machine machine2 = await session2.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine2.Check.Check().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection1); API_TestEnv_Test.Disconnect(connection2); @@ -622,10 +602,8 @@ namespace FabAccessAPI_Test Connection connection2 = await API_TestEnv_Test.Connect(username2); Session session2 = connection1.Session; - MachineSystem.IInfoInterface infoInterface1 = await session1.MachineSystem.Info().ConfigureAwait(false); - MachineSystem.IInfoInterface infoInterface2 = await session2.MachineSystem.Info().ConfigureAwait(false); - Machine machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + Machine machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); // Check State before run Test if (machine1.State != MachineState.free) @@ -636,19 +614,19 @@ namespace FabAccessAPI_Test } await machine1.Use.Use().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine1.Inuse.GiveBack().ConfigureAwait(false); - Machine machine2 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + Machine machine2 = await session2.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine2.Check.Reject().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine1.Inuse.GiveBack().ConfigureAwait(false); - machine2 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + machine2 = await session2.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine2.Check.Check().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection1); API_TestEnv_Test.Disconnect(connection2); @@ -669,11 +647,7 @@ namespace FabAccessAPI_Test Connection connection3 = await API_TestEnv_Test.Connect(username3); Session session3 = connection1.Session; - MachineSystem.IInfoInterface infoInterface1 = await session1.MachineSystem.Info().ConfigureAwait(false); - MachineSystem.IInfoInterface infoInterface2 = await session2.MachineSystem.Info().ConfigureAwait(false); - MachineSystem.IInfoInterface infoInterface3 = await session3.MachineSystem.Info().ConfigureAwait(false); - - Machine machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + Machine machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); // Check State before run Test if (machine1.State != MachineState.free) @@ -684,13 +658,13 @@ namespace FabAccessAPI_Test } await machine1.Use.Use().ConfigureAwait(false); - machine1 = await infoInterface1.GetMachine(machineID).ConfigureAwait(false); + machine1 = await session1.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine1.Inuse.GiveBack().ConfigureAwait(false); - Machine machine2 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + Machine machine2 = await session2.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); bool result = ((CheckInterface_Proxy)machine2.Check).IsNull; - Machine machine3 = await infoInterface2.GetMachine(machineID).ConfigureAwait(false); + Machine machine3 = await session3.MachineSystem.Info.GetMachine(machineID).ConfigureAwait(false); await machine3.Check.Check().ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection1); @@ -714,7 +688,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - bool result = !((PermissionSystem_Proxy)session.PermissionSystem).IsNull; + bool result = session.PermissionSystem != null; API_TestEnv_Test.Disconnect(connection); @@ -750,8 +724,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - PermissionSystem.IInfoInterface infoInterface = await session.PermissionSystem.Info().ConfigureAwait(false); - IReadOnlyList roles_list = await infoInterface.GetRoleList().ConfigureAwait(false); + IReadOnlyList roles_list = await session.PermissionSystem.Info.GetRoleList().ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection); @@ -773,7 +746,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - bool result = !((UserSystem_Proxy)session.UserSystem).IsNull; + bool result = session.UserSystem != null; API_TestEnv_Test.Disconnect(connection); @@ -829,8 +802,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - UserSystem.IInfoInterface infoInterface = await session.UserSystem.Info().ConfigureAwait(false); - User user = (await infoInterface.GetUserSelf().ConfigureAwait(false)).Item1; + User user = await session.UserSystem.Info.GetUserSelf().ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection); @@ -852,8 +824,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - UserSystem.IInfoInterface infoInterface = await session.UserSystem.Info().ConfigureAwait(false); - User user = (await infoInterface.GetUserSelf().ConfigureAwait(false)).Item1; + User user = await session.UserSystem.Info.GetUserSelf().ConfigureAwait(false); bool result = !((User.InfoInterface_Proxy)user.Info).IsNull; @@ -872,8 +843,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - UserSystem.IInfoInterface infoInterface = await session.UserSystem.Info().ConfigureAwait(false); - User user = (await infoInterface.GetUserSelf().ConfigureAwait(false)).Item1; + User user = await session.UserSystem.Info.GetUserSelf().ConfigureAwait(false); bool result = !((User.ManageInterface_Proxy)user.Manage).IsNull; @@ -892,8 +862,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - UserSystem.IInfoInterface infoInterface = await session.UserSystem.Info().ConfigureAwait(false); - User user = (await infoInterface.GetUserSelf().ConfigureAwait(false)).Item1; + User user = await session.UserSystem.Info.GetUserSelf().ConfigureAwait(false); bool result = !((User.AdminInterface_Proxy)user.Admin).IsNull; @@ -912,8 +881,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - UserSystem.IInfoInterface infoInterface = await session.UserSystem.Info().ConfigureAwait(false); - User user = (await infoInterface.GetUserSelf().ConfigureAwait(false)).Item1; + User user = await session.UserSystem.Info.GetUserSelf().ConfigureAwait(false); API_TestEnv_Test.Disconnect(connection); @@ -933,8 +901,7 @@ namespace FabAccessAPI_Test Connection connection = await API_TestEnv_Test.Connect(username); Session session = connection.Session; - UserSystem.IInfoInterface infoInterface = await session.UserSystem.Info().ConfigureAwait(false); - User user = (await infoInterface.GetUserSelf().ConfigureAwait(false)).Item1; + User user = await session.UserSystem.Info.GetUserSelf().ConfigureAwait(false); List roles_user = new List(await user.Info.ListRoles().ConfigureAwait(false)); List expect_roles_list = new List(expect_roles);