Changed all PPC updated to based on GUID !

2 files changed, 26 insertions, 34 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
index 3e3fbcc27..77646da40 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
@@ -38,9 +38,8 @@ namespace Tango.PPC.Common.MachineUpdate
         event EventHandler<MachineUpdateProgress> Progress;
 
         /// <summary>
-        /// Performs a machine update using the specified serial number and machine service address.
+        /// Performs a machine update.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="setupFirmware">if set to <c>true</c> updates the embedded device firmware.</param>
         /// <param name="setupFPGA">if set to <c>true</c> updates the embedded device FPGA version and other parameters.</param>
         /// <returns></returns>
@@ -61,24 +60,22 @@ namespace Tango.PPC.Common.MachineUpdate
         Task UpdateFromTFP(String fileName);
 
         /// <summary>
-        /// Checks if any update are available for the specified machine serial number.
+        /// Checks if any update are available.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <returns></returns>
-        Task<CheckForUpdateResponse> CheckForUpdate(String serialNumber);
+        Task<CheckForUpdateResponse> CheckForUpdate();
 
         /// <summary>
         /// Checks whether it is necessary to updates all the "overwrite-able" database tables.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <returns></returns>
-        Task<DbCompareResult> UpdateDBCheck(String serialNumber);
+        Task<DbCompareResult> UpdateDBCheck();
 
         /// <summary>
         /// Updates all the "overwrite-able" database tables.
         /// </summary>
         /// <returns></returns>
-        Task UpdateDB(DbCompareResult dbCompareResult, String serialNumber);
+        Task UpdateDB(DbCompareResult dbCompareResult);
 
         /// <summary>
         /// Gets the update package file information.
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 4f8be0a6e..9b4462a70 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -148,12 +148,12 @@ namespace Tango.PPC.Common.MachineUpdate
 
         #region Private Methods
 
-        private Task Login(String serialNumber)
+        private Task Login(String machineGuid)
         {
             return _client.Login(new LoginRequest()
             {
                 Mode = LoginMode.Machine,
-                SerialNumber = serialNumber,
+                MachineGuid = machineGuid,
             });
         }
 
@@ -609,9 +609,8 @@ namespace Tango.PPC.Common.MachineUpdate
         #region Public Methods
 
         /// <summary>
-        /// Performs a machine update using the specified serial number and machine service address.
+        /// Performs a machine update.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="setupFirmware">if set to <c>true</c> updates the embedded device firmware.</param>
         /// <param name="setupFPGA">if set to <c>true</c> updates the embedded device FPGA version and other parameters.</param>
         /// <returns></returns>
@@ -638,7 +637,7 @@ namespace Tango.PPC.Common.MachineUpdate
             var _newPackageTempFolder = TemporaryManager.CreateFolder();
             _newPackageTempFolder.Persist = true;
 
-            String serialNumber = _machineProvider.Machine.SerialNumber;
+            String machineGuid = _machineProvider.Machine.Guid;
 
             try
             {
@@ -646,7 +645,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 var machineServiceAddress = _settings.GetMachineServiceAddress();
 
-                LogManager.Log($"Starting machine update for serial number {serialNumber}...");
+                LogManager.Log($"Starting machine update...");
 
                 //Connecting to machine...
                 LogManager.Log("Verifying machine connection and state...");
@@ -677,10 +676,9 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                await Login(serialNumber);
+                await Login(machineGuid);
 
                 DownloadUpdateRequest request = new DownloadUpdateRequest();
-                request.SerialNumber = serialNumber;
 
                 update_response = await _client.MachineUpdate(request);
 
@@ -804,7 +802,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     Path.Combine(_newPackageTempFolder, "Update Scripts"),
                         update_response.DataSource,
                         localDataSource,
-                        serialNumber);
+                        machineGuid);
 
                 runner.Log += (x, msg) =>
                 {
@@ -894,12 +892,11 @@ namespace Tango.PPC.Common.MachineUpdate
         }
 
         /// <summary>
-        /// Checks if any update are available for the specified machine serial number.
+        /// Checks if any update are available for the specified machine.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="machineServiceAddress">The machine service address.</param>
         /// <returns></returns>
-        public Task<CheckForUpdateResponse> CheckForUpdate(string serialNumber)
+        public Task<CheckForUpdateResponse> CheckForUpdate()
         {
             return Task.Factory.StartNew<CheckForUpdateResponse>(() =>
             {
@@ -909,12 +906,13 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).GetAwaiter().GetResult();
+                String machineGuid = _machineProvider.Machine.Guid;
+
+                Login(machineGuid).GetAwaiter().GetResult();
 
                 LogManager.Log($"Checking if updates available...");
 
                 CheckForUpdateRequest request = new CheckForUpdateRequest();
-                request.SerialNumber = serialNumber;
                 request.Version = _app_manager.Version.ToString();
                 request.FirmwareVersion = _app_manager.FirmwareVersion?.ToString();
 
@@ -950,10 +948,9 @@ namespace Tango.PPC.Common.MachineUpdate
         /// <summary>
         /// Updates all the "overwrite-able" database tables.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="machineServiceAddress">The machine service address.</param>
         /// <returns></returns>
-        public Task UpdateDB(DbCompareResult dbCompareResult, String serialNumber)
+        public Task UpdateDB(DbCompareResult dbCompareResult)
         {
             _updateStartDate = DateTime.UtcNow;
             _logs.Clear();
@@ -1034,7 +1031,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                         if (item.RequiresSerialNumber)
                         {
-                            builder.SetMachineSerialNumber(serialNumber);
+                            builder.SetMachineSerialNumber(_machineProvider.Machine.Guid);
                         }
 
                         builder.Synchronize();
@@ -1081,16 +1078,15 @@ namespace Tango.PPC.Common.MachineUpdate
         /// <summary>
         /// Checks whether it is necessary to updates all the "overwrite-able" database tables.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="machineServiceAddress">The machine service address.</param>
         /// <returns></returns>
-        public Task<DbCompareResult> UpdateDBCheck(string serialNumber)
+        public Task<DbCompareResult> UpdateDBCheck()
         {
             return Task.Factory.StartNew<DbCompareResult>(() =>
             {
                 var machineServiceAddress = _settings.GetMachineServiceAddress();
 
-                LogManager.Log($"Checking if database update is required for serial number {serialNumber}...");
+                LogManager.Log($"Checking if database update is required...");
 
                 LogManager.Log("Looking for update scripts configuration on application path...");
 
@@ -1103,10 +1099,9 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).Wait();
+                Login(_machineProvider.Machine.Guid).Wait();
 
                 UpdateDBRequest request = new UpdateDBRequest();
-                request.SerialNumber = serialNumber;
                 request.ApplicationVersion = _app_manager.Version.ToString();
                 request.FirmwareVersion = _app_manager.FirmwareVersion.ToString();
 
@@ -1137,7 +1132,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                     if (item.RequiresSerialNumber)
                     {
-                        builder.SetMachineSerialNumber(serialNumber);
+                        builder.SetMachineSerialNumber(_machineProvider.Machine.Guid);
                     }
 
                     var config = builder.Build();
@@ -1227,7 +1222,7 @@ namespace Tango.PPC.Common.MachineUpdate
             {
                 _isUpdating = true;
 
-                LogManager.Log($"Starting machine update for serial number {serialNumber}...");
+                LogManager.Log($"Starting machine update (TUP) for serial number {serialNumber}...");
 
                 //Connecting to machine...
                 LogManager.Log("Verifying machine connection and state...");
@@ -1368,7 +1363,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     Path.Combine(_newPackageTempFolder, "Update Scripts"),
                         tempDbDataSource,
                         localDataSource,
-                        serialNumber);
+                        _machineProvider.Machine.Guid);
 
                 runner.Log += (x, msg) =>
                 {
@@ -1661,7 +1656,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 try
                 {
-                    var response = await CheckForUpdate(_machineProvider.Machine.SerialNumber);
+                    var response = await CheckForUpdate();
                     if (response.IsUpdateAvailable || response.IsDatabaseUpdateAvailable)
                     {
                         LogManager.Log($"New {(response.IsDatabaseUpdateAvailable ? "database updates" : "application version")} detected ({response.Version}). Raising event...");