Skip to content

Renaming ContainerType, BackupManagementType and WorkloadType for Sql #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2016
Merged

Renaming ContainerType, BackupManagementType and WorkloadType for Sql #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...Services.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ public static AzureRmRecoveryServicesBackupPolicyBase GetPolicyModel(ProtectionP

policyModel = new AzureRmRecoveryServicesAzureSqlPolicy();
AzureRmRecoveryServicesAzureSqlPolicy sqlPolicyModel = policyModel as AzureRmRecoveryServicesAzureSqlPolicy;
sqlPolicyModel.WorkloadType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSqlDb;
sqlPolicyModel.BackupManagementType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureSql;
sqlPolicyModel.WorkloadType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSQLDatabase;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid using fully qualified class names; consider using aliases instead.

sqlPolicyModel.BackupManagementType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureSQL;
sqlPolicyModel.RetentionPolicy = PolicyHelpers.GetPSSimpleRetentionPolicy((SimpleRetentionPolicy)
((AzureSqlProtectionPolicy)hydraResponse.Properties).RetentionPolicy);
}
Expand Down
2 changes: 1 addition & 1 deletion ...eManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static string GetHydraProviderType(CmdletModel.WorkloadType workloadType)
case CmdletModel.WorkloadType.AzureVM:
providerType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();
break;
case CmdletModel.WorkloadType.AzureSqlDb:
case CmdletModel.WorkloadType.AzureSQLDatabase:
providerType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureSql.ToString();
break;
default:
Expand Down
6 changes: 3 additions & 3 deletions ...ger/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
public enum ContainerType
{
AzureVM = 1,
AzureSqlContainer,
AzureSQL,
Windows
}

Expand All @@ -33,7 +33,7 @@ public enum BackupManagementType
MARS,
SCDPM,
AzureBackupServer,
AzureSql,
AzureSQL,
}

public enum BackupEngineType
Expand All @@ -45,7 +45,7 @@ public enum BackupEngineType
public enum WorkloadType
{
AzureVM = 1,
AzureSqlDb,
AzureSQLDatabase,
}

public enum PsBackupProviderTypes
Expand Down
8 changes: 4 additions & 4 deletions ...ger/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType p
case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureBackupServer:
return BackupManagementType.AzureBackupServer;
case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureSql:
return BackupManagementType.AzureSql;
return BackupManagementType.AzureSQL;
default:
throw new Exception("Unsupported BackupManagmentType: " + backupManagementType);
}
Expand All @@ -163,9 +163,9 @@ public static ContainerType GetPsContainerType(string containerType)
{
return ContainerType.Windows;
}
else if (containerType == ContainerType.AzureSqlContainer.ToString())
else if (containerType == ContainerType.AzureSQL.ToString())
{
return ContainerType.AzureSqlContainer;
return ContainerType.AzureSQL;
}
else
{
Expand All @@ -181,7 +181,7 @@ public static WorkloadType GetPsWorkloadType(string workloadType)
}
if (workloadType == Microsoft.Azure.Management.RecoveryServices.Backup.Models.WorkloadType.AzureSqlDb)
{
return WorkloadType.AzureSqlDb;
return WorkloadType.AzureSQLDatabase;
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions ...s.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,10 @@ public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()
#region private
private void ValidateAzureSqlWorkloadType(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType type)
{
if (type != Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSqlDb)
if (type != Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSQLDatabase)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid using fully qualified class names; consider using aliases instead.

{
throw new ArgumentException(string.Format(Resources.UnExpectedWorkLoadTypeException,
Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSqlDb.ToString(),
Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSQLDatabase.ToString(),
type.ToString()));
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...veryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public IPsBackupProvider GetProviderInstance(ContainerType containerType, Backup
else
throw new ArgumentException(String.Format(Resources.BackupManagementTypeIncorrectForContainerType, containerType));
break;
case ContainerType.AzureSqlContainer:
if (backupManagementType == BackupManagementType.AzureSql || backupManagementType == null)
case ContainerType.AzureSQL:
if (backupManagementType == BackupManagementType.AzureSQL || backupManagementType == null)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use braces

providerType = PsBackupProviderTypes.AzureSql;
else
throw new ArgumentException(String.Format(Resources.BackupManagementTypeRequiredForContainerType, containerType));
Expand Down Expand Up @@ -113,9 +113,9 @@ public IPsBackupProvider GetProviderInstance(WorkloadType workloadType, BackupMa
}
psProviderType = PsBackupProviderTypes.IaasVm;
break;
case WorkloadType.AzureSqlDb:
case WorkloadType.AzureSQLDatabase:
// validate backupManagementType is valid
if (backupManagementType.HasValue && backupManagementType != BackupManagementType.AzureSql)
if (backupManagementType.HasValue && backupManagementType != BackupManagementType.AzureSQL)
{
// throw exception that it is not expected
throw new ArgumentException(String.Format(Resources.BackupManagementTypeNotExpectedForWorkloadType,
Expand Down
2 changes: 1 addition & 1 deletion ...ds.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class GetAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupC

[Parameter(Mandatory = false, Position = 2, HelpMessage = ParamHelpMsg.Container.BackupManagementType)]
[ValidateNotNullOrEmpty]
[ValidateSet("AzureVM", "MARS", "AzureSql")]
[ValidateSet("AzureVM", "MARS", "AzureSQL")]
public string BackupManagementType { get; set; }

[Parameter(Mandatory = false, Position = 3, HelpMessage = ParamHelpMsg.Container.Name)]
Expand Down
8 changes: 6 additions & 2 deletions ...veryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ public override void ExecuteCmdlet()
base.ExecuteCmdlet();

if (!((Container.ContainerType == ContainerType.Windows && Container.BackupManagementType == BackupManagementType.MARS) ||
(Container.ContainerType == ContainerType.AzureSqlContainer && Container.BackupManagementType == BackupManagementType.AzureSql)))
(Container.ContainerType == ContainerType.AzureSQL && Container.BackupManagementType == BackupManagementType.AzureSQL)))
{
throw new ArgumentException(String.Format(Resources.UnsupportedContainerException, Container.ContainerType, Container.BackupManagementType));
}
string containerName = Container.Name;
if (Container.ContainerType == ContainerType.AzureSqlContainer)

if (Container.ContainerType == ContainerType.AzureSQL)
{
containerName = ContainerConstansts.SqlContainerNamePrefix + containerName;
}

HydraAdapter.UnregisterContainers(containerName);
});
}
Expand Down
10 changes: 5 additions & 5 deletions ...ands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ public override void ExecuteCmdlet()
{
hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureVM);
}
else if (WorkloadType == Models.WorkloadType.AzureSqlDb)
else if (WorkloadType == Models.WorkloadType.AzureSQLDatabase)
{
hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSqlDb);
hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSQLDatabase);
}
break;

Expand All @@ -108,13 +108,13 @@ public override void ExecuteCmdlet()
}
hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureVM);
}
else if (WorkloadType == Models.WorkloadType.AzureSqlDb)
else if (WorkloadType == Models.WorkloadType.AzureSQLDatabase)
{
if (BackupManagementType != Models.BackupManagementType.AzureSql)
if (BackupManagementType != Models.BackupManagementType.AzureSQL)
{
throw new ArgumentException(Resources.AzureSqlUnsupportedBackupManagementTypeException);
}
hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSqlDb);
hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSQLDatabase);
}
else
{
Expand Down