Added environments support for users & roles !!

1 files changed, 15 insertions, 32 deletions

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 6df7117d7..69df627fb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -164,18 +164,16 @@ namespace Tango.PPC.Common.MachineUpdate
                 //Synchronize database
                 UpdateProgress("Updating Database", "Initializing...");
 
-                String db_name = "Tango";
-                String localAddress = SettingsManager.Default.GetOrCreate<CoreSettings>().DataSource.Address;
-                String remote_address = update_response.DbAddress;
+                var localDataSource = SettingsManager.Default.GetOrCreate<CoreSettings>().DataSource;
 
-                LogManager.Log($"Synchronizing database '{remote_address}\\{db_name}' => '{localAddress}\\{db_name}'...");
+                LogManager.Log($"Synchronizing database '{update_response.DataSource.ToString()}' => '{localDataSource.ToString()}'...");
 
                 UpdateProgress("Updating Database", "Connecting to local database...");
                 LogManager.Log("Initializing database manager...");
-                DbManager db = DbManager.FromAddressAndName(localAddress, db_name);
+                DbManager db = DbManager.FromDataSource(localDataSource);
 
                 LogManager.Log("Checking Tango database exists on the local machine...");
-                if (!db.Exists(db_name))
+                if (!db.Exists(localDataSource.Catalog))
                 {
                     throw new InvalidProgramException("Database tango does not exists.");
                 }
@@ -190,20 +188,9 @@ namespace Tango.PPC.Common.MachineUpdate
                 ExaminerSequenceConfigurationRunner runner = new ExaminerSequenceConfigurationRunner(
                     Path.Combine(_newPackageTempFolder, "Update Scripts", "config.xml"),
                     Path.Combine(_newPackageTempFolder, "Update Scripts"),
-                    new ExaminerSequenceDataSource()
-                    {
-                        Address = remote_address,
-                        DataBaseName = db_name,
-                        IntegratedSecurity = false,
-                        UserName = update_response.DbUserName,
-                        Password = update_response.DbPassword,
-                    },
-                    new ExaminerSequenceDataSource()
-                    {
-                        Address = localAddress,
-                        DataBaseName = db_name,
-                        IntegratedSecurity = true,
-                    }, serialNumber);
+                        update_response.DataSource,
+                        localDataSource,
+                        serialNumber);
 
                 runner.Log += (x, msg) =>
                 {
@@ -331,15 +318,13 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 UpdateDBResponse update_response = dbCompareResult.UpdateDBResponse;
 
-                String db_name = "Tango";
-                String localAddress = SettingsManager.Default.GetOrCreate<CoreSettings>().DataSource.Address;
-                String remote_address = update_response.DbAddress;
+                var localDataSource = SettingsManager.Default.GetOrCreate<CoreSettings>().DataSource;
 
-                LogManager.Log($"Overriding database static tables '{remote_address}\\{db_name}' => '{localAddress}\\{db_name}'...");
+                LogManager.Log($"Overriding database static tables '{update_response.DataSource.ToString()}' => '{localDataSource.ToString()}'...");
 
                 ExaminerConfigurationBuilder builder = new ExaminerConfigurationBuilder(config_file);
-                builder.SetSourceServer(remote_address, db_name, false, update_response.DbUserName, update_response.DbPassword);
-                builder.SetTargetServer(localAddress, db_name, true);
+                builder.SetSource(update_response.DataSource);
+                builder.SetTarget(localDataSource);
                 builder.Synchronize();
 
                 var config = builder.Build();
@@ -410,17 +395,15 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Update DB response received: {Environment.NewLine}{update_response.ToJsonString()}");
 
-                String db_name = "Tango";
-                String localAddress = SettingsManager.Default.GetOrCreate<CoreSettings>().DataSource.Address;
-                String remote_address = update_response.DbAddress;
+                var localDataSource = SettingsManager.Default.GetOrCreate<CoreSettings>().DataSource;
 
-                LogManager.Log($"Comparing database static tables '{remote_address}\\{db_name}' => '{localAddress}\\{db_name}'...");
+                LogManager.Log($"Comparing database static tables '{update_response.DataSource.ToString()}' => '{localDataSource.ToString()}'...");
 
                 var report_file = TemporaryManager.CreateFile(".xml");
 
                 ExaminerConfigurationBuilder builder = new ExaminerConfigurationBuilder(config_file);
-                builder.SetSourceServer(remote_address, db_name, false, update_response.DbUserName, update_response.DbPassword);
-                builder.SetTargetServer(localAddress, db_name, true);
+                builder.SetSource(update_response.DataSource);
+                builder.SetTarget(localDataSource);
                 builder.SetReportFile(report_file);
 
                 var config = builder.Build();