fixing merge problems with backup restore resources

Author: rewongmicrosoft

src/Sql/Sql/Database Backup/Services/AzureSqlDatabaseBackupAdapter.cs

@@ -611,7 +611,7 @@ internal AzureSqlDatabaseModel RestoreDatabase(string resourceGroup, DateTime re
                     Capacity = model.Capacity
                 },
                 LicenseType = model.LicenseType,
-                RequestedBackupStorageRedundancy = MapExternalBackupStorageRedundancyToInternal(model.BackupStorageRedundancy),
+                RequestedBackupStorageRedundancy = model.RequestedBackupStorageRedundancy,
             };
 
             if (model.CreateMode == Management.Sql.Models.CreateMode.Recovery)

src/Sql/Sql/Database/Model/AzureSqlDatabaseModel.cs

@@ -320,7 +320,7 @@ public AzureSqlDatabaseModel(string resourceGroup, string serverName, Management
             AutoPauseDelayInMinutes = database.AutoPauseDelay;
             MinimumCapacity = database.MinCapacity;
             HighAvailabilityReplicaCount = database.HighAvailabilityReplicaCount;
-            BackupStorageRedundancy = MapInternalBackupStorageRedundancyToExternal(database.CurrentBackupStorageRedundancy);
+            RequestedBackupStorageRedundancy = database.RequestedBackupStorageRedundancy;
             SecondaryType = database.SecondaryType;
             MaintenanceConfigurationId = database.MaintenanceConfigurationId;
             EnableLedger = database.IsLedgerOn;

src/Sql/Sql/Database/Services/AzureSqlDatabaseAdapter.cs

@@ -161,7 +161,7 @@ internal AzureSqlDatabaseModel UpsertDatabaseWithNewSdk(string resourceGroup, st
                 AutoPauseDelay = model.Database.AutoPauseDelayInMinutes,
                 MinCapacity = model.Database.MinimumCapacity,
                 HighAvailabilityReplicaCount = model.Database.HighAvailabilityReplicaCount,
-                RequestedBackupStorageRedundancy = MapExternalBackupStorageRedundancyToInternal(model.Database.BackupStorageRedundancy),
+                RequestedBackupStorageRedundancy = model.Database.RequestedBackupStorageRedundancy,
                 SecondaryType = model.Database.SecondaryType,
                 MaintenanceConfigurationId = MaintenanceConfigurationHelper.ConvertMaintenanceConfigurationIdArgument(model.Database.MaintenanceConfigurationId, _subscription.Id),
                 IsLedgerOn = model.Database.EnableLedger,

src/Sql/Sql/Replication/Services/AzureSqlDatabaseReplicationAdapter.cs

@@ -148,7 +148,7 @@ internal AzureSqlDatabaseCopyModel CopyDatabaseWithNewSdk(string copyResourceGro
                     Capacity = model.Capacity
                 },
                 LicenseType = model.LicenseType,
-                RequestedBackupStorageRedundancy = MapExternalBackupStorageRedundancyToInternal(model.BackupStorageRedundancy)
+                RequestedBackupStorageRedundancy = model.RequestedBackupStorageRedundancy,
             });
 
             return CreateDatabaseCopyModelFromResponse(model.CopyResourceGroupName, model.CopyServerName, model.ResourceGroupName,
@@ -212,7 +212,7 @@ private AzureSqlDatabaseCopyModel CreateDatabaseCopyModelFromResponse(string cop
             model.CopyLocation = database.Location;
             model.CreationDate = database.CreationDate.Value;
             model.LicenseType = database.LicenseType;
-            model.BackupStorageRedundancy = MapInternalBackupStorageRedundancyToExternal(database.CurrentBackupStorageRedundancy);
+            model.RequestedBackupStorageRedundancy = database.RequestedBackupStorageRedundancy;
 
             return model;
         }
@@ -273,7 +273,7 @@ internal AzureReplicationLinkModel CreateLinkWithNewSdk(string resourceGroupName
                     Capacity = model.Capacity
                 },
                 LicenseType = model.LicenseType,
-                RequestedBackupStorageRedundancy = MapExternalBackupStorageRedundancyToInternal(model.BackupStorageRedundancy),
+                RequestedBackupStorageRedundancy = model.RequestedBackupStorageRedundancy,
                 SecondaryType = model.SecondaryType,
             });
 
@@ -354,7 +354,7 @@ private AzureReplicationLinkModel CreateReplicationLinkModelFromReplicationLinkR
             model.ServerName = serverName;
             model.DatabaseName = databaseName;
             model.AllowConnections = allowConnections;
-            model.Location = GetServerLocation(resourceGroupName, serverName);
+            model.Location = resp.Location;
             model.PartnerLocation = resp.Properties.PartnerLocation;
             model.PercentComplete = resp.Properties.PercentComplete;
             model.ReplicationState = resp.Properties.ReplicationState;