From 0f5a0b13fc4408952d90d2450c642a7948b88879 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 19 Dec 2018 10:02:27 +0200 Subject: Starting working on improving web api's access... --- .../PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs index 9ae77df6f..ce45258f5 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs @@ -113,7 +113,7 @@ namespace Tango.PPC.Common.MachineUpdate using (var http = new ProtoWebClient()) { - update_response = await http.Post(machineServiceAddress + "/api/Synchronization/MachineUpdate", request); + update_response = await http.Post(machineServiceAddress + "/api/PPC/MachineUpdate", request); } LogManager.Log($"Machine update response received: {Environment.NewLine}{update_response.ToJsonString()}"); @@ -294,7 +294,7 @@ namespace Tango.PPC.Common.MachineUpdate using (var http = new ProtoWebClient()) { - update_response = http.Post(machineServiceAddress + "/api/Synchronization/CheckForUpdate", request).Result; + update_response = http.Post(machineServiceAddress + "/api/PPC/CheckForUpdate", request).Result; } LogManager.Log($"Check for update response received: {Environment.NewLine}{update_response.ToJsonString()}"); @@ -405,7 +405,7 @@ namespace Tango.PPC.Common.MachineUpdate using (var http = new ProtoWebClient()) { - update_response = http.Post(machineServiceAddress + "/api/Synchronization/UpdateDB", request).Result; + update_response = http.Post(machineServiceAddress + "/api/PPC/UpdateDB", request).Result; } LogManager.Log($"Update DB response received: {Environment.NewLine}{update_response.ToJsonString()}"); -- cgit v1.3.1 From de762e7e5b346af5a12eff04cbaa0696eec15b8c Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 19 Dec 2018 12:57:04 +0200 Subject: Moved all web transport to json :/ --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 20578304 -> 20578304 bytes .../Synchronization/CheckForUpdateRequest.proto | 10 - .../Synchronization/CheckForUpdateResponse.proto | 10 - .../Synchronization/DownloadUpdateRequest.proto | 9 - .../Synchronization/DownloadUpdateResponse.proto | 15 - .../Synchronization/MachineSetupRequest.proto | 9 - .../Synchronization/MachineSetupResponse.proto | 23 -- .../Synchronization/SynchronizeDBRequest.proto | 10 - .../Synchronization/SynchronizeDBResponse.proto | 9 - .../Messages/Synchronization/UpdateDBRequest.proto | 9 - .../Synchronization/UpdateDBResponse.proto | 11 - .../Build/Shortcuts/Machine Emulator.lnk | Bin 1530 -> 1471 bytes .../Build/Shortcuts/Machine Studio.lnk | Bin 1516 -> 1532 bytes .../Build/Shortcuts/Proto Compiler GUI.lnk | Bin 1529 -> 1464 bytes .../MachineSetup/MachineSetupManager.cs | 4 +- .../MachineSetup/MachineSetupRequest.cs | 14 + .../MachineSetup/MachineSetupResponse.cs | 28 ++ .../MachineUpdate/CheckForUpdateRequest.cs | 15 + .../MachineUpdate/CheckForUpdateResponse.cs | 15 + .../MachineUpdate/DownloadUpdateRequest.cs | 14 + .../MachineUpdate/DownloadUpdateResponse.cs | 20 + .../MachineUpdate/MachineUpdateManager.cs | 12 +- .../MachineUpdate/UpdateDBRequest.cs | 14 + .../MachineUpdate/UpdateDBResponse.cs | 16 + .../PPC/Tango.PPC.Common/PPCSettings.cs | 6 - .../PPC/Tango.PPC.Common/Tango.PPC.Common.csproj | 8 + .../Update/LatestVersionRequest.cs | 5 +- .../Update/LatestVersionResponse.cs | 5 +- .../Tango.PPC.Common/Update/PPCUpdateService.cs | 8 +- .../Update/UploadCompletedRequest.cs | 5 +- .../Update/UploadCompletedResponse.cs | 4 +- .../Update/UploadVersionRequest.cs | 9 +- .../Update/UploadVersionResponse.cs | 6 +- .../Visual_Studio/Tango.Core/Tango.Core.csproj | 2 +- .../Synchronization/CheckForUpdateRequest.cs | 188 --------- .../Synchronization/CheckForUpdateResponse.cs | 188 --------- .../Synchronization/DownloadUpdateRequest.cs | 160 -------- .../Synchronization/DownloadUpdateResponse.cs | 274 ------------- .../Synchronization/MachineSetupRequest.cs | 160 -------- .../Synchronization/MachineSetupResponse.cs | 444 --------------------- .../Synchronization/SynchronizeDBRequest.cs | 188 --------- .../Synchronization/SynchronizeDBResponse.cs | 160 -------- .../Tango.PMR/Synchronization/UpdateDBRequest.cs | 160 -------- .../Tango.PMR/Synchronization/UpdateDBResponse.cs | 216 ---------- Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj | 12 +- .../Tango.Transport/Tango.Transport.csproj | 13 +- .../Tango.Transport/TransporterBase.cs | 1 + .../Tango.Transport/Web/ITransportWebClient.cs | 14 - .../Tango.Transport/Web/IWebRequestMessage.cs | 12 + .../Tango.Transport/Web/IWebResponseMessage.cs | 12 + .../Tango.Transport/Web/IWebTransportClient.cs | 15 + .../Tango.Transport/Web/IWebTransportMessage.cs | 12 + .../Tango.Transport/Web/JsonWebClient.cs | 69 ---- .../Tango.Transport/Web/ProtoWebClient.cs | 51 --- .../Tango.Transport/Web/WebRequestMessage.cs | 12 + .../Tango.Transport/Web/WebResponseMessage.cs | 12 + .../Tango.Transport/Web/WebTransportClient.cs | 84 ++++ .../Tango.Transport/Web/WebTransportMessage.cs | 12 + .../Tango.UnitTesting/MachineService_TST.cs | 2 +- .../Controllers/HomeController.cs | 16 - .../Controllers/PPCController.cs | 152 ++++++- .../Controllers/ValuesController.cs | 45 --- .../Controllers/VersionUpdateController.cs | 168 -------- .../Tango.MachineService/Models/PendingUpload.cs | 22 + .../Tango.MachineService.csproj | 8 +- 66 files changed, 531 insertions(+), 2676 deletions(-) delete mode 100644 Software/PMR/Messages/Synchronization/CheckForUpdateRequest.proto delete mode 100644 Software/PMR/Messages/Synchronization/CheckForUpdateResponse.proto delete mode 100644 Software/PMR/Messages/Synchronization/DownloadUpdateRequest.proto delete mode 100644 Software/PMR/Messages/Synchronization/DownloadUpdateResponse.proto delete mode 100644 Software/PMR/Messages/Synchronization/MachineSetupRequest.proto delete mode 100644 Software/PMR/Messages/Synchronization/MachineSetupResponse.proto delete mode 100644 Software/PMR/Messages/Synchronization/SynchronizeDBRequest.proto delete mode 100644 Software/PMR/Messages/Synchronization/SynchronizeDBResponse.proto delete mode 100644 Software/PMR/Messages/Synchronization/UpdateDBRequest.proto delete mode 100644 Software/PMR/Messages/Synchronization/UpdateDBResponse.proto create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupRequest.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateRequest.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateResponse.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateRequest.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateResponse.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBRequest.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBResponse.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateRequest.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateResponse.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateRequest.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateResponse.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupRequest.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBRequest.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBResponse.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBRequest.cs delete mode 100644 Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBResponse.cs delete mode 100644 Software/Visual_Studio/Tango.Transport/Web/ITransportWebClient.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/IWebRequestMessage.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/IWebResponseMessage.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/IWebTransportClient.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/IWebTransportMessage.cs delete mode 100644 Software/Visual_Studio/Tango.Transport/Web/JsonWebClient.cs delete mode 100644 Software/Visual_Studio/Tango.Transport/Web/ProtoWebClient.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/WebRequestMessage.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/WebResponseMessage.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs create mode 100644 Software/Visual_Studio/Tango.Transport/Web/WebTransportMessage.cs delete mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs delete mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Controllers/ValuesController.cs delete mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs create mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Models/PendingUpload.cs (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 81ed33c36..5b346239d 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 76a2f4509..1801b28f7 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/Synchronization/CheckForUpdateRequest.proto b/Software/PMR/Messages/Synchronization/CheckForUpdateRequest.proto deleted file mode 100644 index 4b1da8764..000000000 --- a/Software/PMR/Messages/Synchronization/CheckForUpdateRequest.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message CheckForUpdateRequest -{ - string SerialNumber = 1; - string Version = 2; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/CheckForUpdateResponse.proto b/Software/PMR/Messages/Synchronization/CheckForUpdateResponse.proto deleted file mode 100644 index 30e2b6fbb..000000000 --- a/Software/PMR/Messages/Synchronization/CheckForUpdateResponse.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message CheckForUpdateResponse -{ - bool IsUpdateAvailable = 1; - string Version = 2; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/DownloadUpdateRequest.proto b/Software/PMR/Messages/Synchronization/DownloadUpdateRequest.proto deleted file mode 100644 index 98b302f85..000000000 --- a/Software/PMR/Messages/Synchronization/DownloadUpdateRequest.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message DownloadUpdateRequest -{ - string SerialNumber = 1; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/DownloadUpdateResponse.proto b/Software/PMR/Messages/Synchronization/DownloadUpdateResponse.proto deleted file mode 100644 index d48639398..000000000 --- a/Software/PMR/Messages/Synchronization/DownloadUpdateResponse.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message DownloadUpdateResponse -{ - string Version = 1; - - string BlobAddress = 2; - - string DbAddress = 3; - string DbUserName = 4; - string DbPassword = 5; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/MachineSetupRequest.proto b/Software/PMR/Messages/Synchronization/MachineSetupRequest.proto deleted file mode 100644 index 578e3a194..000000000 --- a/Software/PMR/Messages/Synchronization/MachineSetupRequest.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message MachineSetupRequest -{ - string SerialNumber = 1; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/MachineSetupResponse.proto b/Software/PMR/Messages/Synchronization/MachineSetupResponse.proto deleted file mode 100644 index cc0d675b9..000000000 --- a/Software/PMR/Messages/Synchronization/MachineSetupResponse.proto +++ /dev/null @@ -1,23 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message MachineSetupResponse -{ - string Version = 1; - - string BlobAddress = 2; - - string DbAddress = 3; - string DbUserName = 4; - string DbPassword = 5; - - string OSKey = 6; - - bool SetupActivation = 7; - bool SetupRemoteAssistance = 8; - bool SetupUWF = 9; - bool SetupFirmware = 10; - bool IsDemo = 11; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/SynchronizeDBRequest.proto b/Software/PMR/Messages/Synchronization/SynchronizeDBRequest.proto deleted file mode 100644 index b3b6d542f..000000000 --- a/Software/PMR/Messages/Synchronization/SynchronizeDBRequest.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message SynchronizeDBRequest -{ - string SerialNumber = 1; - bytes LocalDB = 2; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/SynchronizeDBResponse.proto b/Software/PMR/Messages/Synchronization/SynchronizeDBResponse.proto deleted file mode 100644 index 091934027..000000000 --- a/Software/PMR/Messages/Synchronization/SynchronizeDBResponse.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message SynchronizeDBResponse -{ - bytes RemoteDB = 1; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/UpdateDBRequest.proto b/Software/PMR/Messages/Synchronization/UpdateDBRequest.proto deleted file mode 100644 index da3fe74c5..000000000 --- a/Software/PMR/Messages/Synchronization/UpdateDBRequest.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message UpdateDBRequest -{ - string SerialNumber = 1; -} \ No newline at end of file diff --git a/Software/PMR/Messages/Synchronization/UpdateDBResponse.proto b/Software/PMR/Messages/Synchronization/UpdateDBResponse.proto deleted file mode 100644 index fbc8e1ec3..000000000 --- a/Software/PMR/Messages/Synchronization/UpdateDBResponse.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto3"; - -package Tango.PMR.Synchronization; -option java_package = "com.twine.tango.pmr.synchronization"; - -message UpdateDBResponse -{ - string DbAddress = 1; - string DbUserName = 2; - string DbPassword = 3; -} \ No newline at end of file diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk index 391bb5fd2..612ccab34 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk index 8f85b4556..09ae17244 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk index 98e7572e8..6f203ca29 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk and b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk differ diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs index eb47ae231..1f86e0953 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -112,9 +112,9 @@ namespace Tango.PPC.Common.MachineSetup try { - using (var http = new ProtoWebClient()) + using (var http = new WebTransportClient()) { - setup_response = await http.Post(machineServiceAddress + "/api/PPC/MachineSetup", request); + setup_response = await http.PostJson(machineServiceAddress + "/api/PPC/MachineSetup", request); } } catch (Exception ex) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupRequest.cs new file mode 100644 index 000000000..4c8039544 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupRequest.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineSetup +{ + public class MachineSetupRequest : WebRequestMessage + { + public String SerialNumber { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs new file mode 100644 index 000000000..89450a1d1 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupResponse.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineSetup +{ + public class MachineSetupResponse : WebResponseMessage + { + public String Version { get; set; } + + public String BlobAddress { get; set; } + + public String DbAddress { get; set; } + public String DbUserName { get; set; } + public String DbPassword { get; set; } + + public String OSKey { get; set; } + + public bool SetupActivation { get; set; } + public bool SetupRemoteAssistance { get; set; } + public bool SetupUWF { get; set; } + public bool SetupFirmware { get; set; } + public bool IsDemo { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateRequest.cs new file mode 100644 index 000000000..cd5789393 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateRequest.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineUpdate +{ + public class CheckForUpdateRequest : WebRequestMessage + { + public String SerialNumber { get; set; } + public String Version { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateResponse.cs new file mode 100644 index 000000000..cbf6c8c64 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/CheckForUpdateResponse.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineUpdate +{ + public class CheckForUpdateResponse : WebResponseMessage + { + public bool IsUpdateAvailable { get; set; } + public String Version { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateRequest.cs new file mode 100644 index 000000000..9369a2a94 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateRequest.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineUpdate +{ + public class DownloadUpdateRequest : WebRequestMessage + { + public String SerialNumber { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateResponse.cs new file mode 100644 index 000000000..c42c06f3b --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/DownloadUpdateResponse.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineUpdate +{ + public class DownloadUpdateResponse : WebResponseMessage + { + public String Version { get; set; } + + public String BlobAddress { get; set; } + + public String DbAddress { get; set; } + public String DbUserName { get; set; } + public String DbPassword { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs index ce45258f5..6df7117d7 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs @@ -111,9 +111,9 @@ namespace Tango.PPC.Common.MachineUpdate DownloadUpdateResponse update_response = null; - using (var http = new ProtoWebClient()) + using (var http = new WebTransportClient()) { - update_response = await http.Post(machineServiceAddress + "/api/PPC/MachineUpdate", request); + update_response = await http.PostJson(machineServiceAddress + "/api/PPC/MachineUpdate", request); } LogManager.Log($"Machine update response received: {Environment.NewLine}{update_response.ToJsonString()}"); @@ -292,9 +292,9 @@ namespace Tango.PPC.Common.MachineUpdate CheckForUpdateResponse update_response = null; - using (var http = new ProtoWebClient()) + using (var http = new WebTransportClient()) { - update_response = http.Post(machineServiceAddress + "/api/PPC/CheckForUpdate", request).Result; + update_response = http.PostJson(machineServiceAddress + "/api/PPC/CheckForUpdate", request).Result; } LogManager.Log($"Check for update response received: {Environment.NewLine}{update_response.ToJsonString()}"); @@ -403,9 +403,9 @@ namespace Tango.PPC.Common.MachineUpdate UpdateDBResponse update_response = null; - using (var http = new ProtoWebClient()) + using (var http = new WebTransportClient()) { - update_response = http.Post(machineServiceAddress + "/api/PPC/UpdateDB", request).Result; + update_response = http.PostJson(machineServiceAddress + "/api/PPC/UpdateDB", request).Result; } LogManager.Log($"Update DB response received: {Environment.NewLine}{update_response.ToJsonString()}"); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBRequest.cs new file mode 100644 index 000000000..1d0caa5a9 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBRequest.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineUpdate +{ + public class UpdateDBRequest : WebRequestMessage + { + public String SerialNumber { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBResponse.cs new file mode 100644 index 000000000..212cd02d2 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/UpdateDBResponse.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Transport.Web; + +namespace Tango.PPC.Common.MachineUpdate +{ + public class UpdateDBResponse : WebResponseMessage + { + public String DbAddress { get; set; } + public String DbUserName { get; set; } + public String DbPassword { get; set; } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs index c33db4854..d6fa39af0 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs @@ -25,11 +25,6 @@ namespace Tango.PPC.Common /// public ApplicationStates ApplicationState { get; set; } - /// - /// Gets the update service address. - /// - public String UpdateServiceAddress { get; internal set; } - /// /// Gets or sets the machine service address. /// @@ -82,7 +77,6 @@ namespace Tango.PPC.Common { MachineScanningTimeoutSeconds = 20; LoggingCategories = new List(); - UpdateServiceAddress = "http://twine01/PPCUpdateService/PPCUpdateService.svc"; MachineServiceAddress = "http://machineservice.twine-srv.com/"; EmbeddedComPort = null; ExternalBridgePassword = "Aa123456"; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index 79c970e5a..790f69ff8 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -136,11 +136,19 @@ + + + + + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionRequest.cs index caa857abc..6a6dab1b4 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionRequest.cs @@ -4,13 +4,12 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; +using Tango.Transport.Web; namespace Tango.PPC.Common.Update { - [DataContract] - public class LatestVersionRequest + public class LatestVersionRequest : WebRequestMessage { - [DataMember] public String MachineVersionGuid { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionResponse.cs index aa753fb18..8e97a8177 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/LatestVersionResponse.cs @@ -4,13 +4,12 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; +using Tango.Transport.Web; namespace Tango.PPC.Common.Update { - [DataContract] - public class LatestVersionResponse + public class LatestVersionResponse : WebResponseMessage { - [DataMember] public String Version { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/PPCUpdateService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/PPCUpdateService.cs index 282e4d627..b6654ef59 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/PPCUpdateService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/PPCUpdateService.cs @@ -3,18 +3,20 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Settings; using Tango.Transport.Web; namespace Tango.PPC.Common.Update { public class PPCUpdateService : IPPCUpdateService { - private string address = "http://localhost:51581/api/VersionUpdate/"; - private JsonWebClient _client; + private string address; + private WebTransportClient _client; public PPCUpdateService() { - _client = new JsonWebClient(); + address = SettingsManager.Default.GetOrCreate().MachineServiceAddress + "/api/PPC/"; + _client = new WebTransportClient(); } public Task UploadVersion(UploadVersionRequest request) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedRequest.cs index ce30a9d7c..55e733e04 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedRequest.cs @@ -4,13 +4,12 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; +using Tango.Transport.Web; namespace Tango.PPC.Common.Update { - [DataContract] - public class UploadCompletedRequest + public class UploadCompletedRequest : WebRequestMessage { - [DataMember] public String Token { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedResponse.cs index 171c92172..1cce32e7d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadCompletedResponse.cs @@ -4,11 +4,11 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; +using Tango.Transport.Web; namespace Tango.PPC.Common.Update { - [DataContract] - public class UploadCompletedResponse + public class UploadCompletedResponse : WebResponseMessage { } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionRequest.cs index 5672e8fd9..0b496d7be 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionRequest.cs @@ -4,25 +4,20 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; +using Tango.Transport.Web; namespace Tango.PPC.Common.Update { - [DataContract] - public class UploadVersionRequest + public class UploadVersionRequest : WebRequestMessage { - [DataMember] public String Email { get; set; } - [DataMember] public String Password { get; set; } - [DataMember] public String Version { get; set; } - [DataMember] public String MachineVersionGuid { get; set; } - [DataMember] public String Comments { get; set; } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionResponse.cs index ca40617f1..4543261e7 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Update/UploadVersionResponse.cs @@ -4,16 +4,14 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; +using Tango.Transport.Web; namespace Tango.PPC.Common.Update { - [DataContract] - public class UploadVersionResponse + public class UploadVersionResponse : WebResponseMessage { - [DataMember] public String Token { get; set; } - [DataMember] public String BlobAddress { get; set; } } } diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj index 469a17cd9..1fe53252f 100644 --- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj +++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj @@ -192,7 +192,7 @@ - + diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateRequest.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateRequest.cs deleted file mode 100644 index c873c62a5..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateRequest.cs +++ /dev/null @@ -1,188 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: CheckForUpdateRequest.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from CheckForUpdateRequest.proto - public static partial class CheckForUpdateRequestReflection { - - #region Descriptor - /// File descriptor for CheckForUpdateRequest.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static CheckForUpdateRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChtDaGVja0ZvclVwZGF0ZVJlcXVlc3QucHJvdG8SGVRhbmdvLlBNUi5TeW5j", - "aHJvbml6YXRpb24iPgoVQ2hlY2tGb3JVcGRhdGVSZXF1ZXN0EhQKDFNlcmlh", - "bE51bWJlchgBIAEoCRIPCgdWZXJzaW9uGAIgASgJQiUKI2NvbS50d2luZS50", - "YW5nby5wbXIuc3luY2hyb25pemF0aW9uYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.CheckForUpdateRequest), global::Tango.PMR.Synchronization.CheckForUpdateRequest.Parser, new[]{ "SerialNumber", "Version" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class CheckForUpdateRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new CheckForUpdateRequest()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.CheckForUpdateRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public CheckForUpdateRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public CheckForUpdateRequest(CheckForUpdateRequest other) : this() { - serialNumber_ = other.serialNumber_; - version_ = other.version_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public CheckForUpdateRequest Clone() { - return new CheckForUpdateRequest(this); - } - - /// Field number for the "SerialNumber" field. - public const int SerialNumberFieldNumber = 1; - private string serialNumber_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string SerialNumber { - get { return serialNumber_; } - set { - serialNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "Version" field. - public const int VersionFieldNumber = 2; - private string version_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Version { - get { return version_; } - set { - version_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as CheckForUpdateRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(CheckForUpdateRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (SerialNumber != other.SerialNumber) return false; - if (Version != other.Version) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode(); - if (Version.Length != 0) hash ^= Version.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (SerialNumber.Length != 0) { - output.WriteRawTag(10); - output.WriteString(SerialNumber); - } - if (Version.Length != 0) { - output.WriteRawTag(18); - output.WriteString(Version); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (SerialNumber.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(SerialNumber); - } - if (Version.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Version); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(CheckForUpdateRequest other) { - if (other == null) { - return; - } - if (other.SerialNumber.Length != 0) { - SerialNumber = other.SerialNumber; - } - if (other.Version.Length != 0) { - Version = other.Version; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - SerialNumber = input.ReadString(); - break; - } - case 18: { - Version = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateResponse.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateResponse.cs deleted file mode 100644 index 736c653e5..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/CheckForUpdateResponse.cs +++ /dev/null @@ -1,188 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: CheckForUpdateResponse.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from CheckForUpdateResponse.proto - public static partial class CheckForUpdateResponseReflection { - - #region Descriptor - /// File descriptor for CheckForUpdateResponse.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static CheckForUpdateResponseReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChxDaGVja0ZvclVwZGF0ZVJlc3BvbnNlLnByb3RvEhlUYW5nby5QTVIuU3lu", - "Y2hyb25pemF0aW9uIkQKFkNoZWNrRm9yVXBkYXRlUmVzcG9uc2USGQoRSXNV", - "cGRhdGVBdmFpbGFibGUYASABKAgSDwoHVmVyc2lvbhgCIAEoCUIlCiNjb20u", - "dHdpbmUudGFuZ28ucG1yLnN5bmNocm9uaXphdGlvbmIGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.CheckForUpdateResponse), global::Tango.PMR.Synchronization.CheckForUpdateResponse.Parser, new[]{ "IsUpdateAvailable", "Version" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class CheckForUpdateResponse : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new CheckForUpdateResponse()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.CheckForUpdateResponseReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public CheckForUpdateResponse() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public CheckForUpdateResponse(CheckForUpdateResponse other) : this() { - isUpdateAvailable_ = other.isUpdateAvailable_; - version_ = other.version_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public CheckForUpdateResponse Clone() { - return new CheckForUpdateResponse(this); - } - - /// Field number for the "IsUpdateAvailable" field. - public const int IsUpdateAvailableFieldNumber = 1; - private bool isUpdateAvailable_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool IsUpdateAvailable { - get { return isUpdateAvailable_; } - set { - isUpdateAvailable_ = value; - } - } - - /// Field number for the "Version" field. - public const int VersionFieldNumber = 2; - private string version_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Version { - get { return version_; } - set { - version_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as CheckForUpdateResponse); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(CheckForUpdateResponse other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (IsUpdateAvailable != other.IsUpdateAvailable) return false; - if (Version != other.Version) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (IsUpdateAvailable != false) hash ^= IsUpdateAvailable.GetHashCode(); - if (Version.Length != 0) hash ^= Version.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (IsUpdateAvailable != false) { - output.WriteRawTag(8); - output.WriteBool(IsUpdateAvailable); - } - if (Version.Length != 0) { - output.WriteRawTag(18); - output.WriteString(Version); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (IsUpdateAvailable != false) { - size += 1 + 1; - } - if (Version.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Version); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(CheckForUpdateResponse other) { - if (other == null) { - return; - } - if (other.IsUpdateAvailable != false) { - IsUpdateAvailable = other.IsUpdateAvailable; - } - if (other.Version.Length != 0) { - Version = other.Version; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 8: { - IsUpdateAvailable = input.ReadBool(); - break; - } - case 18: { - Version = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateRequest.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateRequest.cs deleted file mode 100644 index 26a0eb8ff..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateRequest.cs +++ /dev/null @@ -1,160 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: DownloadUpdateRequest.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from DownloadUpdateRequest.proto - public static partial class DownloadUpdateRequestReflection { - - #region Descriptor - /// File descriptor for DownloadUpdateRequest.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static DownloadUpdateRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChtEb3dubG9hZFVwZGF0ZVJlcXVlc3QucHJvdG8SGVRhbmdvLlBNUi5TeW5j", - "aHJvbml6YXRpb24iLQoVRG93bmxvYWRVcGRhdGVSZXF1ZXN0EhQKDFNlcmlh", - "bE51bWJlchgBIAEoCUIlCiNjb20udHdpbmUudGFuZ28ucG1yLnN5bmNocm9u", - "aXphdGlvbmIGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.DownloadUpdateRequest), global::Tango.PMR.Synchronization.DownloadUpdateRequest.Parser, new[]{ "SerialNumber" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class DownloadUpdateRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new DownloadUpdateRequest()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.DownloadUpdateRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DownloadUpdateRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DownloadUpdateRequest(DownloadUpdateRequest other) : this() { - serialNumber_ = other.serialNumber_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DownloadUpdateRequest Clone() { - return new DownloadUpdateRequest(this); - } - - /// Field number for the "SerialNumber" field. - public const int SerialNumberFieldNumber = 1; - private string serialNumber_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string SerialNumber { - get { return serialNumber_; } - set { - serialNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as DownloadUpdateRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(DownloadUpdateRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (SerialNumber != other.SerialNumber) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (SerialNumber.Length != 0) { - output.WriteRawTag(10); - output.WriteString(SerialNumber); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (SerialNumber.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(SerialNumber); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(DownloadUpdateRequest other) { - if (other == null) { - return; - } - if (other.SerialNumber.Length != 0) { - SerialNumber = other.SerialNumber; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - SerialNumber = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateResponse.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateResponse.cs deleted file mode 100644 index ef91448ff..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/DownloadUpdateResponse.cs +++ /dev/null @@ -1,274 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: DownloadUpdateResponse.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from DownloadUpdateResponse.proto - public static partial class DownloadUpdateResponseReflection { - - #region Descriptor - /// File descriptor for DownloadUpdateResponse.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static DownloadUpdateResponseReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChxEb3dubG9hZFVwZGF0ZVJlc3BvbnNlLnByb3RvEhlUYW5nby5QTVIuU3lu", - "Y2hyb25pemF0aW9uInkKFkRvd25sb2FkVXBkYXRlUmVzcG9uc2USDwoHVmVy", - "c2lvbhgBIAEoCRITCgtCbG9iQWRkcmVzcxgCIAEoCRIRCglEYkFkZHJlc3MY", - "AyABKAkSEgoKRGJVc2VyTmFtZRgEIAEoCRISCgpEYlBhc3N3b3JkGAUgASgJ", - "QiUKI2NvbS50d2luZS50YW5nby5wbXIuc3luY2hyb25pemF0aW9uYgZwcm90", - "bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.DownloadUpdateResponse), global::Tango.PMR.Synchronization.DownloadUpdateResponse.Parser, new[]{ "Version", "BlobAddress", "DbAddress", "DbUserName", "DbPassword" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class DownloadUpdateResponse : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new DownloadUpdateResponse()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.DownloadUpdateResponseReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DownloadUpdateResponse() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DownloadUpdateResponse(DownloadUpdateResponse other) : this() { - version_ = other.version_; - blobAddress_ = other.blobAddress_; - dbAddress_ = other.dbAddress_; - dbUserName_ = other.dbUserName_; - dbPassword_ = other.dbPassword_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public DownloadUpdateResponse Clone() { - return new DownloadUpdateResponse(this); - } - - /// Field number for the "Version" field. - public const int VersionFieldNumber = 1; - private string version_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Version { - get { return version_; } - set { - version_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "BlobAddress" field. - public const int BlobAddressFieldNumber = 2; - private string blobAddress_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string BlobAddress { - get { return blobAddress_; } - set { - blobAddress_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbAddress" field. - public const int DbAddressFieldNumber = 3; - private string dbAddress_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbAddress { - get { return dbAddress_; } - set { - dbAddress_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbUserName" field. - public const int DbUserNameFieldNumber = 4; - private string dbUserName_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbUserName { - get { return dbUserName_; } - set { - dbUserName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbPassword" field. - public const int DbPasswordFieldNumber = 5; - private string dbPassword_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbPassword { - get { return dbPassword_; } - set { - dbPassword_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as DownloadUpdateResponse); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(DownloadUpdateResponse other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Version != other.Version) return false; - if (BlobAddress != other.BlobAddress) return false; - if (DbAddress != other.DbAddress) return false; - if (DbUserName != other.DbUserName) return false; - if (DbPassword != other.DbPassword) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (Version.Length != 0) hash ^= Version.GetHashCode(); - if (BlobAddress.Length != 0) hash ^= BlobAddress.GetHashCode(); - if (DbAddress.Length != 0) hash ^= DbAddress.GetHashCode(); - if (DbUserName.Length != 0) hash ^= DbUserName.GetHashCode(); - if (DbPassword.Length != 0) hash ^= DbPassword.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (Version.Length != 0) { - output.WriteRawTag(10); - output.WriteString(Version); - } - if (BlobAddress.Length != 0) { - output.WriteRawTag(18); - output.WriteString(BlobAddress); - } - if (DbAddress.Length != 0) { - output.WriteRawTag(26); - output.WriteString(DbAddress); - } - if (DbUserName.Length != 0) { - output.WriteRawTag(34); - output.WriteString(DbUserName); - } - if (DbPassword.Length != 0) { - output.WriteRawTag(42); - output.WriteString(DbPassword); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (Version.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Version); - } - if (BlobAddress.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(BlobAddress); - } - if (DbAddress.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbAddress); - } - if (DbUserName.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbUserName); - } - if (DbPassword.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbPassword); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(DownloadUpdateResponse other) { - if (other == null) { - return; - } - if (other.Version.Length != 0) { - Version = other.Version; - } - if (other.BlobAddress.Length != 0) { - BlobAddress = other.BlobAddress; - } - if (other.DbAddress.Length != 0) { - DbAddress = other.DbAddress; - } - if (other.DbUserName.Length != 0) { - DbUserName = other.DbUserName; - } - if (other.DbPassword.Length != 0) { - DbPassword = other.DbPassword; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - Version = input.ReadString(); - break; - } - case 18: { - BlobAddress = input.ReadString(); - break; - } - case 26: { - DbAddress = input.ReadString(); - break; - } - case 34: { - DbUserName = input.ReadString(); - break; - } - case 42: { - DbPassword = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupRequest.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupRequest.cs deleted file mode 100644 index d332f5bf8..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupRequest.cs +++ /dev/null @@ -1,160 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: MachineSetupRequest.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from MachineSetupRequest.proto - public static partial class MachineSetupRequestReflection { - - #region Descriptor - /// File descriptor for MachineSetupRequest.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static MachineSetupRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChlNYWNoaW5lU2V0dXBSZXF1ZXN0LnByb3RvEhlUYW5nby5QTVIuU3luY2hy", - "b25pemF0aW9uIisKE01hY2hpbmVTZXR1cFJlcXVlc3QSFAoMU2VyaWFsTnVt", - "YmVyGAEgASgJQiUKI2NvbS50d2luZS50YW5nby5wbXIuc3luY2hyb25pemF0", - "aW9uYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.MachineSetupRequest), global::Tango.PMR.Synchronization.MachineSetupRequest.Parser, new[]{ "SerialNumber" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class MachineSetupRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MachineSetupRequest()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.MachineSetupRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MachineSetupRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MachineSetupRequest(MachineSetupRequest other) : this() { - serialNumber_ = other.serialNumber_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MachineSetupRequest Clone() { - return new MachineSetupRequest(this); - } - - /// Field number for the "SerialNumber" field. - public const int SerialNumberFieldNumber = 1; - private string serialNumber_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string SerialNumber { - get { return serialNumber_; } - set { - serialNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as MachineSetupRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(MachineSetupRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (SerialNumber != other.SerialNumber) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (SerialNumber.Length != 0) { - output.WriteRawTag(10); - output.WriteString(SerialNumber); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (SerialNumber.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(SerialNumber); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(MachineSetupRequest other) { - if (other == null) { - return; - } - if (other.SerialNumber.Length != 0) { - SerialNumber = other.SerialNumber; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - SerialNumber = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs deleted file mode 100644 index e2650cf2b..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/MachineSetupResponse.cs +++ /dev/null @@ -1,444 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: MachineSetupResponse.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from MachineSetupResponse.proto - public static partial class MachineSetupResponseReflection { - - #region Descriptor - /// File descriptor for MachineSetupResponse.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static MachineSetupResponseReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChpNYWNoaW5lU2V0dXBSZXNwb25zZS5wcm90bxIZVGFuZ28uUE1SLlN5bmNo", - "cm9uaXphdGlvbiL3AQoUTWFjaGluZVNldHVwUmVzcG9uc2USDwoHVmVyc2lv", - "bhgBIAEoCRITCgtCbG9iQWRkcmVzcxgCIAEoCRIRCglEYkFkZHJlc3MYAyAB", - "KAkSEgoKRGJVc2VyTmFtZRgEIAEoCRISCgpEYlBhc3N3b3JkGAUgASgJEg0K", - "BU9TS2V5GAYgASgJEhcKD1NldHVwQWN0aXZhdGlvbhgHIAEoCBIdChVTZXR1", - "cFJlbW90ZUFzc2lzdGFuY2UYCCABKAgSEAoIU2V0dXBVV0YYCSABKAgSFQoN", - "U2V0dXBGaXJtd2FyZRgKIAEoCBIOCgZJc0RlbW8YCyABKAhCJQojY29tLnR3", - "aW5lLnRhbmdvLnBtci5zeW5jaHJvbml6YXRpb25iBnByb3RvMw==")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.MachineSetupResponse), global::Tango.PMR.Synchronization.MachineSetupResponse.Parser, new[]{ "Version", "BlobAddress", "DbAddress", "DbUserName", "DbPassword", "OSKey", "SetupActivation", "SetupRemoteAssistance", "SetupUWF", "SetupFirmware", "IsDemo" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class MachineSetupResponse : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MachineSetupResponse()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.MachineSetupResponseReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MachineSetupResponse() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MachineSetupResponse(MachineSetupResponse other) : this() { - version_ = other.version_; - blobAddress_ = other.blobAddress_; - dbAddress_ = other.dbAddress_; - dbUserName_ = other.dbUserName_; - dbPassword_ = other.dbPassword_; - oSKey_ = other.oSKey_; - setupActivation_ = other.setupActivation_; - setupRemoteAssistance_ = other.setupRemoteAssistance_; - setupUWF_ = other.setupUWF_; - setupFirmware_ = other.setupFirmware_; - isDemo_ = other.isDemo_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public MachineSetupResponse Clone() { - return new MachineSetupResponse(this); - } - - /// Field number for the "Version" field. - public const int VersionFieldNumber = 1; - private string version_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Version { - get { return version_; } - set { - version_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "BlobAddress" field. - public const int BlobAddressFieldNumber = 2; - private string blobAddress_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string BlobAddress { - get { return blobAddress_; } - set { - blobAddress_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbAddress" field. - public const int DbAddressFieldNumber = 3; - private string dbAddress_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbAddress { - get { return dbAddress_; } - set { - dbAddress_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbUserName" field. - public const int DbUserNameFieldNumber = 4; - private string dbUserName_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbUserName { - get { return dbUserName_; } - set { - dbUserName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbPassword" field. - public const int DbPasswordFieldNumber = 5; - private string dbPassword_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbPassword { - get { return dbPassword_; } - set { - dbPassword_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "OSKey" field. - public const int OSKeyFieldNumber = 6; - private string oSKey_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string OSKey { - get { return oSKey_; } - set { - oSKey_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "SetupActivation" field. - public const int SetupActivationFieldNumber = 7; - private bool setupActivation_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool SetupActivation { - get { return setupActivation_; } - set { - setupActivation_ = value; - } - } - - /// Field number for the "SetupRemoteAssistance" field. - public const int SetupRemoteAssistanceFieldNumber = 8; - private bool setupRemoteAssistance_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool SetupRemoteAssistance { - get { return setupRemoteAssistance_; } - set { - setupRemoteAssistance_ = value; - } - } - - /// Field number for the "SetupUWF" field. - public const int SetupUWFFieldNumber = 9; - private bool setupUWF_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool SetupUWF { - get { return setupUWF_; } - set { - setupUWF_ = value; - } - } - - /// Field number for the "SetupFirmware" field. - public const int SetupFirmwareFieldNumber = 10; - private bool setupFirmware_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool SetupFirmware { - get { return setupFirmware_; } - set { - setupFirmware_ = value; - } - } - - /// Field number for the "IsDemo" field. - public const int IsDemoFieldNumber = 11; - private bool isDemo_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool IsDemo { - get { return isDemo_; } - set { - isDemo_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as MachineSetupResponse); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(MachineSetupResponse other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Version != other.Version) return false; - if (BlobAddress != other.BlobAddress) return false; - if (DbAddress != other.DbAddress) return false; - if (DbUserName != other.DbUserName) return false; - if (DbPassword != other.DbPassword) return false; - if (OSKey != other.OSKey) return false; - if (SetupActivation != other.SetupActivation) return false; - if (SetupRemoteAssistance != other.SetupRemoteAssistance) return false; - if (SetupUWF != other.SetupUWF) return false; - if (SetupFirmware != other.SetupFirmware) return false; - if (IsDemo != other.IsDemo) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (Version.Length != 0) hash ^= Version.GetHashCode(); - if (BlobAddress.Length != 0) hash ^= BlobAddress.GetHashCode(); - if (DbAddress.Length != 0) hash ^= DbAddress.GetHashCode(); - if (DbUserName.Length != 0) hash ^= DbUserName.GetHashCode(); - if (DbPassword.Length != 0) hash ^= DbPassword.GetHashCode(); - if (OSKey.Length != 0) hash ^= OSKey.GetHashCode(); - if (SetupActivation != false) hash ^= SetupActivation.GetHashCode(); - if (SetupRemoteAssistance != false) hash ^= SetupRemoteAssistance.GetHashCode(); - if (SetupUWF != false) hash ^= SetupUWF.GetHashCode(); - if (SetupFirmware != false) hash ^= SetupFirmware.GetHashCode(); - if (IsDemo != false) hash ^= IsDemo.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (Version.Length != 0) { - output.WriteRawTag(10); - output.WriteString(Version); - } - if (BlobAddress.Length != 0) { - output.WriteRawTag(18); - output.WriteString(BlobAddress); - } - if (DbAddress.Length != 0) { - output.WriteRawTag(26); - output.WriteString(DbAddress); - } - if (DbUserName.Length != 0) { - output.WriteRawTag(34); - output.WriteString(DbUserName); - } - if (DbPassword.Length != 0) { - output.WriteRawTag(42); - output.WriteString(DbPassword); - } - if (OSKey.Length != 0) { - output.WriteRawTag(50); - output.WriteString(OSKey); - } - if (SetupActivation != false) { - output.WriteRawTag(56); - output.WriteBool(SetupActivation); - } - if (SetupRemoteAssistance != false) { - output.WriteRawTag(64); - output.WriteBool(SetupRemoteAssistance); - } - if (SetupUWF != false) { - output.WriteRawTag(72); - output.WriteBool(SetupUWF); - } - if (SetupFirmware != false) { - output.WriteRawTag(80); - output.WriteBool(SetupFirmware); - } - if (IsDemo != false) { - output.WriteRawTag(88); - output.WriteBool(IsDemo); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (Version.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Version); - } - if (BlobAddress.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(BlobAddress); - } - if (DbAddress.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbAddress); - } - if (DbUserName.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbUserName); - } - if (DbPassword.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbPassword); - } - if (OSKey.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(OSKey); - } - if (SetupActivation != false) { - size += 1 + 1; - } - if (SetupRemoteAssistance != false) { - size += 1 + 1; - } - if (SetupUWF != false) { - size += 1 + 1; - } - if (SetupFirmware != false) { - size += 1 + 1; - } - if (IsDemo != false) { - size += 1 + 1; - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(MachineSetupResponse other) { - if (other == null) { - return; - } - if (other.Version.Length != 0) { - Version = other.Version; - } - if (other.BlobAddress.Length != 0) { - BlobAddress = other.BlobAddress; - } - if (other.DbAddress.Length != 0) { - DbAddress = other.DbAddress; - } - if (other.DbUserName.Length != 0) { - DbUserName = other.DbUserName; - } - if (other.DbPassword.Length != 0) { - DbPassword = other.DbPassword; - } - if (other.OSKey.Length != 0) { - OSKey = other.OSKey; - } - if (other.SetupActivation != false) { - SetupActivation = other.SetupActivation; - } - if (other.SetupRemoteAssistance != false) { - SetupRemoteAssistance = other.SetupRemoteAssistance; - } - if (other.SetupUWF != false) { - SetupUWF = other.SetupUWF; - } - if (other.SetupFirmware != false) { - SetupFirmware = other.SetupFirmware; - } - if (other.IsDemo != false) { - IsDemo = other.IsDemo; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - Version = input.ReadString(); - break; - } - case 18: { - BlobAddress = input.ReadString(); - break; - } - case 26: { - DbAddress = input.ReadString(); - break; - } - case 34: { - DbUserName = input.ReadString(); - break; - } - case 42: { - DbPassword = input.ReadString(); - break; - } - case 50: { - OSKey = input.ReadString(); - break; - } - case 56: { - SetupActivation = input.ReadBool(); - break; - } - case 64: { - SetupRemoteAssistance = input.ReadBool(); - break; - } - case 72: { - SetupUWF = input.ReadBool(); - break; - } - case 80: { - SetupFirmware = input.ReadBool(); - break; - } - case 88: { - IsDemo = input.ReadBool(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBRequest.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBRequest.cs deleted file mode 100644 index 54efa1062..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBRequest.cs +++ /dev/null @@ -1,188 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: SynchronizeDBRequest.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from SynchronizeDBRequest.proto - public static partial class SynchronizeDBRequestReflection { - - #region Descriptor - /// File descriptor for SynchronizeDBRequest.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static SynchronizeDBRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChpTeW5jaHJvbml6ZURCUmVxdWVzdC5wcm90bxIZVGFuZ28uUE1SLlN5bmNo", - "cm9uaXphdGlvbiI9ChRTeW5jaHJvbml6ZURCUmVxdWVzdBIUCgxTZXJpYWxO", - "dW1iZXIYASABKAkSDwoHTG9jYWxEQhgCIAEoDEIlCiNjb20udHdpbmUudGFu", - "Z28ucG1yLnN5bmNocm9uaXphdGlvbmIGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.SynchronizeDBRequest), global::Tango.PMR.Synchronization.SynchronizeDBRequest.Parser, new[]{ "SerialNumber", "LocalDB" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class SynchronizeDBRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new SynchronizeDBRequest()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.SynchronizeDBRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SynchronizeDBRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SynchronizeDBRequest(SynchronizeDBRequest other) : this() { - serialNumber_ = other.serialNumber_; - localDB_ = other.localDB_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SynchronizeDBRequest Clone() { - return new SynchronizeDBRequest(this); - } - - /// Field number for the "SerialNumber" field. - public const int SerialNumberFieldNumber = 1; - private string serialNumber_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string SerialNumber { - get { return serialNumber_; } - set { - serialNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "LocalDB" field. - public const int LocalDBFieldNumber = 2; - private pb::ByteString localDB_ = pb::ByteString.Empty; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pb::ByteString LocalDB { - get { return localDB_; } - set { - localDB_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as SynchronizeDBRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(SynchronizeDBRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (SerialNumber != other.SerialNumber) return false; - if (LocalDB != other.LocalDB) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode(); - if (LocalDB.Length != 0) hash ^= LocalDB.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (SerialNumber.Length != 0) { - output.WriteRawTag(10); - output.WriteString(SerialNumber); - } - if (LocalDB.Length != 0) { - output.WriteRawTag(18); - output.WriteBytes(LocalDB); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (SerialNumber.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(SerialNumber); - } - if (LocalDB.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeBytesSize(LocalDB); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(SynchronizeDBRequest other) { - if (other == null) { - return; - } - if (other.SerialNumber.Length != 0) { - SerialNumber = other.SerialNumber; - } - if (other.LocalDB.Length != 0) { - LocalDB = other.LocalDB; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - SerialNumber = input.ReadString(); - break; - } - case 18: { - LocalDB = input.ReadBytes(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBResponse.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBResponse.cs deleted file mode 100644 index e25a903b9..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/SynchronizeDBResponse.cs +++ /dev/null @@ -1,160 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: SynchronizeDBResponse.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from SynchronizeDBResponse.proto - public static partial class SynchronizeDBResponseReflection { - - #region Descriptor - /// File descriptor for SynchronizeDBResponse.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static SynchronizeDBResponseReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChtTeW5jaHJvbml6ZURCUmVzcG9uc2UucHJvdG8SGVRhbmdvLlBNUi5TeW5j", - "aHJvbml6YXRpb24iKQoVU3luY2hyb25pemVEQlJlc3BvbnNlEhAKCFJlbW90", - "ZURCGAEgASgMQiUKI2NvbS50d2luZS50YW5nby5wbXIuc3luY2hyb25pemF0", - "aW9uYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.SynchronizeDBResponse), global::Tango.PMR.Synchronization.SynchronizeDBResponse.Parser, new[]{ "RemoteDB" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class SynchronizeDBResponse : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new SynchronizeDBResponse()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.SynchronizeDBResponseReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SynchronizeDBResponse() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SynchronizeDBResponse(SynchronizeDBResponse other) : this() { - remoteDB_ = other.remoteDB_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SynchronizeDBResponse Clone() { - return new SynchronizeDBResponse(this); - } - - /// Field number for the "RemoteDB" field. - public const int RemoteDBFieldNumber = 1; - private pb::ByteString remoteDB_ = pb::ByteString.Empty; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pb::ByteString RemoteDB { - get { return remoteDB_; } - set { - remoteDB_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as SynchronizeDBResponse); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(SynchronizeDBResponse other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (RemoteDB != other.RemoteDB) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (RemoteDB.Length != 0) hash ^= RemoteDB.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (RemoteDB.Length != 0) { - output.WriteRawTag(10); - output.WriteBytes(RemoteDB); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (RemoteDB.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeBytesSize(RemoteDB); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(SynchronizeDBResponse other) { - if (other == null) { - return; - } - if (other.RemoteDB.Length != 0) { - RemoteDB = other.RemoteDB; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - RemoteDB = input.ReadBytes(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBRequest.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBRequest.cs deleted file mode 100644 index b55b41571..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBRequest.cs +++ /dev/null @@ -1,160 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: UpdateDBRequest.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from UpdateDBRequest.proto - public static partial class UpdateDBRequestReflection { - - #region Descriptor - /// File descriptor for UpdateDBRequest.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static UpdateDBRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChVVcGRhdGVEQlJlcXVlc3QucHJvdG8SGVRhbmdvLlBNUi5TeW5jaHJvbml6", - "YXRpb24iJwoPVXBkYXRlREJSZXF1ZXN0EhQKDFNlcmlhbE51bWJlchgBIAEo", - "CUIlCiNjb20udHdpbmUudGFuZ28ucG1yLnN5bmNocm9uaXphdGlvbmIGcHJv", - "dG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.UpdateDBRequest), global::Tango.PMR.Synchronization.UpdateDBRequest.Parser, new[]{ "SerialNumber" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class UpdateDBRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new UpdateDBRequest()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.UpdateDBRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UpdateDBRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UpdateDBRequest(UpdateDBRequest other) : this() { - serialNumber_ = other.serialNumber_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UpdateDBRequest Clone() { - return new UpdateDBRequest(this); - } - - /// Field number for the "SerialNumber" field. - public const int SerialNumberFieldNumber = 1; - private string serialNumber_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string SerialNumber { - get { return serialNumber_; } - set { - serialNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as UpdateDBRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(UpdateDBRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (SerialNumber != other.SerialNumber) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (SerialNumber.Length != 0) { - output.WriteRawTag(10); - output.WriteString(SerialNumber); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (SerialNumber.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(SerialNumber); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(UpdateDBRequest other) { - if (other == null) { - return; - } - if (other.SerialNumber.Length != 0) { - SerialNumber = other.SerialNumber; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - SerialNumber = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBResponse.cs b/Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBResponse.cs deleted file mode 100644 index 9ab596bc2..000000000 --- a/Software/Visual_Studio/Tango.PMR/Synchronization/UpdateDBResponse.cs +++ /dev/null @@ -1,216 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: UpdateDBResponse.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace Tango.PMR.Synchronization { - - /// Holder for reflection information generated from UpdateDBResponse.proto - public static partial class UpdateDBResponseReflection { - - #region Descriptor - /// File descriptor for UpdateDBResponse.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static UpdateDBResponseReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChZVcGRhdGVEQlJlc3BvbnNlLnByb3RvEhlUYW5nby5QTVIuU3luY2hyb25p", - "emF0aW9uIk0KEFVwZGF0ZURCUmVzcG9uc2USEQoJRGJBZGRyZXNzGAEgASgJ", - "EhIKCkRiVXNlck5hbWUYAiABKAkSEgoKRGJQYXNzd29yZBgDIAEoCUIlCiNj", - "b20udHdpbmUudGFuZ28ucG1yLnN5bmNocm9uaXphdGlvbmIGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Synchronization.UpdateDBResponse), global::Tango.PMR.Synchronization.UpdateDBResponse.Parser, new[]{ "DbAddress", "DbUserName", "DbPassword" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class UpdateDBResponse : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new UpdateDBResponse()); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::Tango.PMR.Synchronization.UpdateDBResponseReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UpdateDBResponse() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UpdateDBResponse(UpdateDBResponse other) : this() { - dbAddress_ = other.dbAddress_; - dbUserName_ = other.dbUserName_; - dbPassword_ = other.dbPassword_; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UpdateDBResponse Clone() { - return new UpdateDBResponse(this); - } - - /// Field number for the "DbAddress" field. - public const int DbAddressFieldNumber = 1; - private string dbAddress_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbAddress { - get { return dbAddress_; } - set { - dbAddress_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbUserName" field. - public const int DbUserNameFieldNumber = 2; - private string dbUserName_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbUserName { - get { return dbUserName_; } - set { - dbUserName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "DbPassword" field. - public const int DbPasswordFieldNumber = 3; - private string dbPassword_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string DbPassword { - get { return dbPassword_; } - set { - dbPassword_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as UpdateDBResponse); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(UpdateDBResponse other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (DbAddress != other.DbAddress) return false; - if (DbUserName != other.DbUserName) return false; - if (DbPassword != other.DbPassword) return false; - return true; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (DbAddress.Length != 0) hash ^= DbAddress.GetHashCode(); - if (DbUserName.Length != 0) hash ^= DbUserName.GetHashCode(); - if (DbPassword.Length != 0) hash ^= DbPassword.GetHashCode(); - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (DbAddress.Length != 0) { - output.WriteRawTag(10); - output.WriteString(DbAddress); - } - if (DbUserName.Length != 0) { - output.WriteRawTag(18); - output.WriteString(DbUserName); - } - if (DbPassword.Length != 0) { - output.WriteRawTag(26); - output.WriteString(DbPassword); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (DbAddress.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbAddress); - } - if (DbUserName.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbUserName); - } - if (DbPassword.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(DbPassword); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(UpdateDBResponse other) { - if (other == null) { - return; - } - if (other.DbAddress.Length != 0) { - DbAddress = other.DbAddress; - } - if (other.DbUserName.Length != 0) { - DbUserName = other.DbUserName; - } - if (other.DbPassword.Length != 0) { - DbPassword = other.DbPassword; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - input.SkipLastField(); - break; - case 10: { - DbAddress = input.ReadString(); - break; - } - case 18: { - DbUserName = input.ReadString(); - break; - } - case 26: { - DbPassword = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 790d0e3e5..1d8d5e16c 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -228,21 +228,11 @@ - - - - - - - - - - @@ -260,7 +250,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj index 02457471d..02e5381ee 100644 --- a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj +++ b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj @@ -107,9 +107,14 @@ - - - + + + + + + + + @@ -136,7 +141,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs index 05a892b37..581e62cc7 100644 --- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs +++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs @@ -880,6 +880,7 @@ namespace Tango.Transport continue; } + LogManager.Log("Sending message on adapter: " + Adapter.Address + "...", LogCategory.Debug, message.Message); Adapter.Write(message.Serialize()); LogManager.Log("Message sent on adapter: " + Adapter.Address + "...", LogCategory.Debug, message.Message); } diff --git a/Software/Visual_Studio/Tango.Transport/Web/ITransportWebClient.cs b/Software/Visual_Studio/Tango.Transport/Web/ITransportWebClient.cs deleted file mode 100644 index 81d443671..000000000 --- a/Software/Visual_Studio/Tango.Transport/Web/ITransportWebClient.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Google.Protobuf; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.Transport.Web -{ - public interface ITransportWebClient : IDisposable - { - Task Post(String url, Request request) where Request : class, IMessage where Response : class, IMessage; - } -} diff --git a/Software/Visual_Studio/Tango.Transport/Web/IWebRequestMessage.cs b/Software/Visual_Studio/Tango.Transport/Web/IWebRequestMessage.cs new file mode 100644 index 000000000..7a8f293f4 --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/IWebRequestMessage.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Transport.Web +{ + public interface IWebRequestMessage : IWebTransportMessage + { + } +} diff --git a/Software/Visual_Studio/Tango.Transport/Web/IWebResponseMessage.cs b/Software/Visual_Studio/Tango.Transport/Web/IWebResponseMessage.cs new file mode 100644 index 000000000..eba39959f --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/IWebResponseMessage.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Transport.Web +{ + public interface IWebResponseMessage : IWebTransportMessage + { + } +} diff --git a/Software/Visual_Studio/Tango.Transport/Web/IWebTransportClient.cs b/Software/Visual_Studio/Tango.Transport/Web/IWebTransportClient.cs new file mode 100644 index 000000000..8ab0f9305 --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/IWebTransportClient.cs @@ -0,0 +1,15 @@ +using Google.Protobuf; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Transport.Web +{ + public interface IWebTransportClient : IDisposable + { + Task PostProto(String url, Request request) where Request : class, IMessage where Response : class, IMessage; + Task PostJson(String url, Request request) where Request : class, IWebRequestMessage where Response : class, IWebResponseMessage; + } +} diff --git a/Software/Visual_Studio/Tango.Transport/Web/IWebTransportMessage.cs b/Software/Visual_Studio/Tango.Transport/Web/IWebTransportMessage.cs new file mode 100644 index 000000000..48d9960d9 --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/IWebTransportMessage.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Transport.Web +{ + public interface IWebTransportMessage + { + } +} diff --git a/Software/Visual_Studio/Tango.Transport/Web/JsonWebClient.cs b/Software/Visual_Studio/Tango.Transport/Web/JsonWebClient.cs deleted file mode 100644 index 8b654dd61..000000000 --- a/Software/Visual_Studio/Tango.Transport/Web/JsonWebClient.cs +++ /dev/null @@ -1,69 +0,0 @@ -using Google.Protobuf; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Text; -using System.Threading.Tasks; -using System.Web; -using Tango.PMR.Synchronization; - -namespace Tango.Transport.Web -{ - public class JsonWebClient : ITransportWebClient - { - private HttpClient _httpClient; - - public JsonWebClient() - { - _httpClient = new HttpClient(); - } - - public void Dispose() - { - throw new NotImplementedException(); - } - - public Task Post(String url, Request request) where Request : class, IMessage where Response : class, IMessage - { - return Task.Factory.StartNew(() => - { - var req = new ByteArrayContent(Encoding.UTF8.GetBytes(request.ToString())); - req.Headers.Add("Content-Type", "application/json"); - - var response = _httpClient.PostAsync(url, req).Result; - - var data = response.Content.ReadAsStringAsync().Result; - - Response dummy = Activator.CreateInstance() as Response; - - return dummy.GetParser().ParseJson(data) as Response; - }); - } - - public Task PostJson(String url, Request request) where Request : class where Response : class - { - return Task.Factory.StartNew(() => - { - var req = new ByteArrayContent(Encoding.UTF8.GetBytes(request.ToJsonString())); - req.Headers.Add("Content-Type", "application/json"); - - var response = _httpClient.PostAsync(url, req).Result; - var data = response.Content.ReadAsStringAsync().Result; - - try - { - response.EnsureSuccessStatusCode(); - } - catch (HttpRequestException ex) - { - throw new HttpRequestException(ex.Message + " " + JObject.Parse(data).GetValue("Message")); - } - - return JsonConvert.DeserializeObject(data); - }); - } - } -} diff --git a/Software/Visual_Studio/Tango.Transport/Web/ProtoWebClient.cs b/Software/Visual_Studio/Tango.Transport/Web/ProtoWebClient.cs deleted file mode 100644 index 7f8beef04..000000000 --- a/Software/Visual_Studio/Tango.Transport/Web/ProtoWebClient.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Google.Protobuf; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Text; -using System.Threading.Tasks; -using System.Web; -using Tango.PMR.Synchronization; - -namespace Tango.Transport.Web -{ - public class ProtoWebClient : ITransportWebClient - { - private HttpClient _httpClient; - - public ProtoWebClient() - { - _httpClient = new HttpClient(); - } - - public Task Post(String url, Request request) where Request : class, IMessage where Response : class, IMessage - { - return Task.Factory.StartNew(() => - { - - var req = new ByteArrayContent(request.ToByteArray()); - req.Headers.Add("Content-Type", "application/x-protobuf"); - - var response = _httpClient.PostAsync(url, req).Result; - - var data = response.Content.ReadAsByteArrayAsync().Result; - - if (response.StatusCode != System.Net.HttpStatusCode.OK) - { - HttpProtoException exception = HttpProtoException.Parser.ParseFrom(data); - throw new HttpException(exception.StatusCode, exception.Message); - } - - Response dummy = Activator.CreateInstance() as Response; - - return dummy.GetParser().ParseFrom(data) as Response; - }); - } - - public void Dispose() - { - _httpClient.Dispose(); - } - } -} diff --git a/Software/Visual_Studio/Tango.Transport/Web/WebRequestMessage.cs b/Software/Visual_Studio/Tango.Transport/Web/WebRequestMessage.cs new file mode 100644 index 000000000..a7bdd87ad --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/WebRequestMessage.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Transport.Web +{ + public abstract class WebRequestMessage : WebTransportMessage, IWebRequestMessage + { + } +} diff --git a/Software/Visual_Studio/Tango.Transport/Web/WebResponseMessage.cs b/Software/Visual_Studio/Tango.Transport/Web/WebResponseMessage.cs new file mode 100644 index 000000000..adaf3b0eb --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/WebResponseMessage.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Transport.Web +{ + public abstract class WebResponseMessage : WebTransportMessage, IWebResponseMessage + { + } +} diff --git a/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs b/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs new file mode 100644 index 000000000..227ecefa3 --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs @@ -0,0 +1,84 @@ +using Google.Protobuf; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using System.Web; +using Tango.PMR.Synchronization; + +namespace Tango.Transport.Web +{ + public class WebTransportClient : IWebTransportClient + { + private HttpClient _httpClient; + private static JsonSerializerSettings _settings; + + static WebTransportClient() + { + _settings = new JsonSerializerSettings() + { + + }; + } + + public WebTransportClient() + { + _httpClient = new HttpClient(); + } + + public Task PostProto(String url, Request request) where Request : class, IMessage where Response : class, IMessage + { + return Task.Factory.StartNew(() => + { + + var req = new ByteArrayContent(request.ToByteArray()); + req.Headers.Add("Content-Type", "application/x-protobuf"); + + var response = _httpClient.PostAsync(url, req).Result; + + var data = response.Content.ReadAsByteArrayAsync().Result; + + if (response.StatusCode != System.Net.HttpStatusCode.OK) + { + HttpProtoException exception = HttpProtoException.Parser.ParseFrom(data); + throw new HttpException(exception.StatusCode, exception.Message); + } + + Response dummy = Activator.CreateInstance() as Response; + + return dummy.GetParser().ParseFrom(data) as Response; + }); + } + + public Task PostJson(string url, Request request) where Request : class, IWebRequestMessage where Response : class, IWebResponseMessage + { + return Task.Factory.StartNew(() => + { + var req = new ByteArrayContent(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(request, _settings))); + req.Headers.Add("Content-Type", "application/json"); + var response = _httpClient.PostAsync(url, req).Result; + var data = response.Content.ReadAsStringAsync().Result; + + try + { + response.EnsureSuccessStatusCode(); + } + catch (HttpRequestException ex) + { + throw new HttpRequestException(ex.Message + " " + JObject.Parse(data).GetValue("Message")); + } + + return JsonConvert.DeserializeObject(data); + }); + } + + public void Dispose() + { + _httpClient.Dispose(); + } + } +} diff --git a/Software/Visual_Studio/Tango.Transport/Web/WebTransportMessage.cs b/Software/Visual_Studio/Tango.Transport/Web/WebTransportMessage.cs new file mode 100644 index 000000000..3f886d9d2 --- /dev/null +++ b/Software/Visual_Studio/Tango.Transport/Web/WebTransportMessage.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Transport.Web +{ + public abstract class WebTransportMessage : IWebTransportMessage + { + } +} diff --git a/Software/Visual_Studio/Tango.UnitTesting/MachineService_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/MachineService_TST.cs index 954d53da8..94d30df98 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/MachineService_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/MachineService_TST.cs @@ -16,7 +16,7 @@ namespace Tango.UnitTesting [TestMethod] public void Check_For_Updates() { - ITransportWebClient client = new ProtoWebClient(); + IWebTransportClient client = new WebTransportClient(); var result = client.Post("http://localhost:51581/api/PPC/CheckForUpdate", new CheckForUpdateRequest() { SerialNumber = "0000", diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs deleted file mode 100644 index a7c526f67..000000000 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; - -namespace Tango.MachineService.Controllers -{ - public class HomeController : Controller - { - public String Index() - { - return "Machine Service Started!"; - } - } -} diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs index c5e85f819..45396e47a 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs @@ -17,6 +17,7 @@ using System.Web.Http; using Tango.BL; using Tango.BL.Builders; using Tango.BL.Entities; +using Tango.BL.Enumerations; using Tango.Core.DB; using Tango.Core.Helpers; using Tango.Core.IO; @@ -26,13 +27,29 @@ using Tango.MachineService.Models; using Tango.MachineService.SMO; using Tango.PMR.Stubs; using Tango.PMR.Synchronization; +using Tango.PPC.Common.MachineSetup; +using Tango.PPC.Common.MachineUpdate; +using Tango.PPC.Common.Update; using Tango.Synchronization.Local; using Tango.Synchronization.Remote; namespace Tango.MachineService.Controllers { - public class PPCController : ProtoController + public class PPCController : JsonController { + private static List _pendingUploads; + + #region Constructors + + static PPCController() + { + _pendingUploads = new List(); + } + + #endregion + + #region Setup & Update + [HttpPost] public MachineSetupResponse MachineSetup(MachineSetupRequest request) { @@ -222,6 +239,139 @@ namespace Tango.MachineService.Controllers return response; } + #endregion + + #region Version Upload + + [HttpPost] + public LatestVersionResponse GetLatestVersion(LatestVersionRequest request) + { + LatestVersionResponse response = new LatestVersionResponse(); + + using (ObservablesContext db = ObservablesContextHelper.CreateContext()) + { + var versions = db.TangoVersions.ToList(); + + if (versions.Count == 0) + { + return new LatestVersionResponse() + { + Version = "0.0.0.0", + }; + } + + var machine_versions = versions.Where(x => x.MachineVersionGuid == request.MachineVersionGuid).ToList(); + + if (machine_versions.Count > 0) + { + response.Version = db.TangoVersions.Where(x => x.MachineVersionGuid == request.MachineVersionGuid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault().Version; + } + else + { + throw new ArgumentException("The specified machine version was not found!"); + } + } + + return response; + } + + [HttpPost] + public UploadVersionResponse UploadVersion(UploadVersionRequest request) + { + UploadVersionResponse response = new UploadVersionResponse(); + + using (ObservablesContext db = ObservablesContextHelper.CreateContext()) + { + //Load relations first... + db.Roles.ToList(); + db.Permissions.ToList(); + db.UsersRoles.ToList(); + db.RolesPermissions.ToList(); + + var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); + + if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion)) + { + var versions = db.TangoVersions.ToList().Where(x => x.MachineVersionGuid == request.MachineVersionGuid).OrderByDescending(x => Version.Parse(x.Version)).ToList(); + + TangoVersion latestVersion = new TangoVersion(); + latestVersion.Version = "0.0.0.0"; + + if (versions.Count > 0) + { + latestVersion = versions.FirstOrDefault(); + } + + Version currentVersion = Version.Parse(request.Version); + + if (currentVersion > Version.Parse(latestVersion.Version)) + { + String newVersionFileName = "Tango Version" + " " + currentVersion.ToString() + ".zip"; + + var client = StorageHelper.GetStorageBlobClient(); + var container = StorageHelper.GetTangoVersionsContainer(client); + var blob = StorageHelper.CreateEmptyBlob(container, newVersionFileName); + + response.Token = Guid.NewGuid().ToString(); + response.BlobAddress = StorageHelper.GenerateBlobWriteSignature(blob, TimeSpan.FromMinutes(30)); + + _pendingUploads.Add(new PendingUpload() + { + UserGuid = user.Guid, + Comments = request.Comments, + Token = response.Token, + Version = request.Version, + BlobName = blob.Name, + MachineVersionGuid = request.MachineVersionGuid, + }); + } + else + { + throw new ArgumentException("New version must be greater than latest version."); + } + } + else + { + throw new AuthenticationException("Invalid user credentials."); + } + } + + return response; + } + + [HttpPost] + public UploadCompletedResponse NotifyUploadCompleted(UploadCompletedRequest request) + { + PendingUpload upload = _pendingUploads.FirstOrDefault(x => x.Token == request.Token); + + if (upload != null) + { + _pendingUploads.RemoveAll(x => x.Token == upload.Token); + + using (ObservablesContext db = ObservablesContextHelper.CreateContext()) + { + db.TangoVersions.Add(new TangoVersion() + { + Comments = upload.Comments, + BlobName = upload.BlobName, + UserGuid = upload.UserGuid, + Version = upload.Version, + MachineVersionGuid = upload.MachineVersionGuid + }); + + db.SaveChanges(); + } + + return new UploadCompletedResponse(); + } + else + { + throw new AuthenticationException("Invalid upload token."); + } + } + + #endregion + [HttpPost] public Machine PersonTest(Person p) { diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/ValuesController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/ValuesController.cs deleted file mode 100644 index f76d66836..000000000 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/ValuesController.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Web.Http; -using Tango.MachineService.Models; - -namespace Tango.MachineService.Controllers -{ - public class ValuesController : ApiController - { - private static List persons = new List(); - - // GET api/values - public IEnumerable Get() - { - return persons; - } - - // GET api/values/5 - public Person Get(int id) - { - return persons[id]; - } - - // POST api/values - public Person Post([FromBody]Person person) - { - persons.Add(person); - return person; - } - - // PUT api/values/5 - public void Put(Person person) - { - - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - } -} diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs deleted file mode 100644 index 2ad8bd735..000000000 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/VersionUpdateController.cs +++ /dev/null @@ -1,168 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Security.Authentication; -using System.Web.Http; -using Tango.BL; -using Tango.BL.Entities; -using Tango.BL.Enumerations; -using Tango.Logging; -using Tango.MachineService.Helpers; -using Tango.PPC.Common.Update; - -namespace Tango.MachineService.Controllers -{ - public class VersionUpdateController : JsonController - { - private class PendingUpload - { - public String Token { get; set; } - - public String Version { get; set; } - - public String UserGuid { get; set; } - - public String Comments { get; set; } - - public String MachineVersionGuid { get; set; } - - public String BlobName { get; set; } - } - - private static List _pendingUploads; - - static VersionUpdateController() - { - _pendingUploads = new List(); - } - - [HttpPost] - public LatestVersionResponse GetLatestVersion(LatestVersionRequest request) - { - LatestVersionResponse response = new LatestVersionResponse(); - - using (ObservablesContext db = ObservablesContextHelper.CreateContext()) - { - var versions = db.TangoVersions.ToList(); - - if (versions.Count == 0) - { - return new LatestVersionResponse() - { - Version = "0.0.0.0", - }; - } - - var machine_versions = versions.Where(x => x.MachineVersionGuid == request.MachineVersionGuid).ToList(); - - if (machine_versions.Count > 0) - { - response.Version = db.TangoVersions.Where(x => x.MachineVersionGuid == request.MachineVersionGuid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault().Version; - } - else - { - throw new ArgumentException("The specified machine version was not found!"); - } - } - - return response; - } - - [HttpPost] - public UploadVersionResponse UploadVersion(UploadVersionRequest request) - { - UploadVersionResponse response = new UploadVersionResponse(); - - using (ObservablesContext db = ObservablesContextHelper.CreateContext()) - { - //Load relations first... - db.Roles.ToList(); - db.Permissions.ToList(); - db.UsersRoles.ToList(); - db.RolesPermissions.ToList(); - - var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); - - if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion)) - { - var versions = db.TangoVersions.ToList().Where(x => x.MachineVersionGuid == request.MachineVersionGuid).OrderByDescending(x => Version.Parse(x.Version)).ToList(); - - TangoVersion latestVersion = new TangoVersion(); - latestVersion.Version = "0.0.0.0"; - - if (versions.Count > 0) - { - latestVersion = versions.FirstOrDefault(); - } - - Version currentVersion = Version.Parse(request.Version); - - if (currentVersion > Version.Parse(latestVersion.Version)) - { - String newVersionFileName = "Tango Version" + " " + currentVersion.ToString() + ".zip"; - - var client = StorageHelper.GetStorageBlobClient(); - var container = StorageHelper.GetTangoVersionsContainer(client); - var blob = StorageHelper.CreateEmptyBlob(container, newVersionFileName); - - response.Token = Guid.NewGuid().ToString(); - response.BlobAddress = StorageHelper.GenerateBlobWriteSignature(blob, TimeSpan.FromMinutes(30)); - - _pendingUploads.Add(new PendingUpload() - { - UserGuid = user.Guid, - Comments = request.Comments, - Token = response.Token, - Version = request.Version, - BlobName = blob.Name, - MachineVersionGuid = request.MachineVersionGuid, - }); - } - else - { - throw new ArgumentException("New version must be greater than latest version."); - } - } - else - { - throw new AuthenticationException("Invalid user credentials."); - } - } - - return response; - } - - [HttpPost] - public UploadCompletedResponse NotifyUploadCompleted(UploadCompletedRequest request) - { - PendingUpload upload = _pendingUploads.FirstOrDefault(x => x.Token == request.Token); - - if (upload != null) - { - _pendingUploads.RemoveAll(x => x.Token == upload.Token); - - using (ObservablesContext db = ObservablesContextHelper.CreateContext()) - { - db.TangoVersions.Add(new TangoVersion() - { - Comments = upload.Comments, - BlobName = upload.BlobName, - UserGuid = upload.UserGuid, - Version = upload.Version, - MachineVersionGuid = upload.MachineVersionGuid - }); - - db.SaveChanges(); - } - - return new UploadCompletedResponse(); - } - else - { - throw new AuthenticationException("Invalid upload token."); - } - } - } -} diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Models/PendingUpload.cs b/Software/Visual_Studio/Web/Tango.MachineService/Models/PendingUpload.cs new file mode 100644 index 000000000..f18b3756a --- /dev/null +++ b/Software/Visual_Studio/Web/Tango.MachineService/Models/PendingUpload.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace Tango.MachineService.Models +{ + public class PendingUpload + { + public String Token { get; set; } + + public String Version { get; set; } + + public String UserGuid { get; set; } + + public String Comments { get; set; } + + public String MachineVersionGuid { get; set; } + + public String BlobName { get; set; } + } +} \ No newline at end of file diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index c7fdab45c..acb4ad84e 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -270,17 +270,15 @@ - + - - Global.asax @@ -331,6 +329,10 @@ {7ada4e86-cad7-4968-a210-3a8a9e5153ab} Tango.Synchronization + + {74e700b0-1156-4126-be40-ee450d3c3026} + Tango.Transport + -- cgit v1.3.1