From 09c1e15643f82b2187019025682b5da0bfbe1c1d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 21 Nov 2019 09:20:44 +0200 Subject: Fixed issue with machine clone and device registration. Implemented device registration details and reset in Machine Designer. --- .../PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs') 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 004c37096..c1d9cf055 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -135,11 +135,11 @@ namespace Tango.PPC.Common.MachineSetup request.DeviceID = await _windows_manager.GetDeviceId(); request.DeviceName = await _windows_manager.GetDeviceName(); - MachineSetupResponse setup_response = null; try { + LogManager.Log($"Sending setup request...\n{request.ToJsonString()}"); setup_response = await _client.MachineSetup(request); } catch (Exception ex) -- cgit v1.3.1 From 36ddcab9aa3c9cde38f7b11b2b553d842bb6354b Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 24 Nov 2019 12:49:55 +0200 Subject: Added environment name to PPC TeamViewer name. --- .../PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs | 2 +- .../RemoteAssistance/DefaultRemoteAssistanceProvider.cs | 4 ++-- .../Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs') 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 c1d9cf055..29c5bc6a2 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -180,7 +180,7 @@ namespace Tango.PPC.Common.MachineSetup { LogManager.Log("Installing remote assistance..."); UpdateProgress("Installing remote assistance", "Installing..."); - await _remoteAssistance.InstallRemoteAssistance(serialNumber); + await _remoteAssistance.InstallRemoteAssistance(serialNumber,settings.DeploymentSlot.ToString()); } if (setup_response.SetupUWF) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs index eae13a882..65327e705 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/DefaultRemoteAssistanceProvider.cs @@ -97,7 +97,7 @@ namespace Tango.PPC.Common.RemoteAssistance /// /// The machine serial number. /// - public async Task InstallRemoteAssistance(String machineSerialNumber) + public async Task InstallRemoteAssistance(String machineSerialNumber, String environment) { try { @@ -108,7 +108,7 @@ namespace Tango.PPC.Common.RemoteAssistance if (!(await IsRemoteAssistanceInstalled())) { - CmdCommand command = new CmdCommand("msiexec.exe", $"/i \"{_installer_path}\" /qn CUSTOMCONFIGID=ke43ann APITOKEN=4765529-gon1LwO1N1TTrlLI21ji ASSIGNMENTOPTIONS=\" --reassign --alias {"TANGO-" + machineSerialNumber} --grant-easy-access\""); + CmdCommand command = new CmdCommand("msiexec.exe", $"/i \"{_installer_path}\" /qn CUSTOMCONFIGID=ke43ann APITOKEN=4765529-gon1LwO1N1TTrlLI21ji ASSIGNMENTOPTIONS=\" --reassign --alias {"TANGO-" + machineSerialNumber}-{environment} --grant-easy-access\""); command.Timeout = TimeSpan.FromSeconds(30); await command.Run(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs index cafb8dab9..3d3b4e532 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/RemoteAssistance/IRemoteAssistanceProvider.cs @@ -32,7 +32,8 @@ namespace Tango.PPC.Common.RemoteAssistance /// Installs the remote assistance. /// /// The machine serial number. + /// The machine working environment. /// - Task InstallRemoteAssistance(String machineSerialNumber); + Task InstallRemoteAssistance(String machineSerialNumber, String environment); } } -- cgit v1.3.1