Merge pull request #325 from MabOneSdk/swatim-azuresql

swatimadhukargit · swatimadhukargit · commit 599eebac62d3 · 2016-05-06T03:24:12.000-07:00
Renaming ContainerType, BackupManagementType and WorkloadType for Sql
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
@@ -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;
+                sqlPolicyModel.BackupManagementType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureSQL;
                 sqlPolicyModel.RetentionPolicy = PolicyHelpers.GetPSSimpleRetentionPolicy((SimpleRetentionPolicy)
                                                   ((AzureSqlProtectionPolicy)hydraResponse.Properties).RetentionPolicy);
             }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs
@@ -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:
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Enums.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Enums.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
     public enum ContainerType
     {
         AzureVM = 1,
-        AzureSqlContainer,
+        AzureSQL,
         Windows
     }
 
@@ -33,7 +33,7 @@ public enum BackupManagementType
         MARS,
         SCDPM,
         AzureBackupServer,
-        AzureSql,
+        AzureSQL,
     }
 
     public enum BackupEngineType
@@ -45,7 +45,7 @@ public enum BackupEngineType
     public enum WorkloadType
     {
         AzureVM = 1,
-        AzureSqlDb,
+        AzureSQLDatabase,
     }
 
     public enum PsBackupProviderTypes
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs
@@ -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);
             }
@@ -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
             {
@@ -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
             {
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs
@@ -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)
             {
                 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()));
             }
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs
@@ -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)
                         providerType = PsBackupProviderTypes.AzureSql;
                     else
                         throw new ArgumentException(String.Format(Resources.BackupManagementTypeRequiredForContainerType, containerType));
@@ -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,
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesBackupContainer.cs
@@ -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)]
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs
@@ -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);
             });
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesPolicy.cs
@@ -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;
 
@@ -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
                            {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models`
`23`	`23`	`public enum ContainerType`
`24`	`24`	`{`
`25`	`25`	`AzureVM = 1,`
`26`		`- AzureSqlContainer,`
	`26`	`+ AzureSQL,`
`27`	`27`	`Windows`
`28`	`28`	`}`
`29`	`29`
`@@ -33,7 +33,7 @@ public enum BackupManagementType`
`33`	`33`	`MARS,`
`34`	`34`	`SCDPM,`
`35`	`35`	`AzureBackupServer,`
`36`		`- AzureSql,`
	`36`	`+ AzureSQL,`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public enum BackupEngineType`
`@@ -45,7 +45,7 @@ public enum BackupEngineType`
`45`	`45`	`public enum WorkloadType`
`46`	`46`	`{`
`47`	`47`	`AzureVM = 1,`
`48`		`- AzureSqlDb,`
	`48`	`+ AzureSQLDatabase,`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public enum PsBackupProviderTypes`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType p`
`146`	`146`	`case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureBackupServer:`
`147`	`147`	`return BackupManagementType.AzureBackupServer;`
`148`	`148`	`case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureSql:`
`149`		`- return BackupManagementType.AzureSql;`
	`149`	`+ return BackupManagementType.AzureSQL;`
`150`	`150`	`default:`
`151`	`151`	`throw new Exception("Unsupported BackupManagmentType: " + backupManagementType);`
`152`	`152`	`}`
`@@ -163,9 +163,9 @@ public static ContainerType GetPsContainerType(string containerType)`
`163`	`163`	`{`
`164`	`164`	`return ContainerType.Windows;`
`165`	`165`	`}`
`166`		`- else if (containerType == ContainerType.AzureSqlContainer.ToString())`
	`166`	`+ else if (containerType == ContainerType.AzureSQL.ToString())`
`167`	`167`	`{`
`168`		`- return ContainerType.AzureSqlContainer;`
	`168`	`+ return ContainerType.AzureSQL;`
`169`	`169`	`}`
`170`	`170`	`else`
`171`	`171`	`{`
`@@ -181,7 +181,7 @@ public static WorkloadType GetPsWorkloadType(string workloadType)`
`181`	`181`	`}`
`182`	`182`	`if (workloadType == Microsoft.Azure.Management.RecoveryServices.Backup.Models.WorkloadType.AzureSqlDb)`
`183`	`183`	`{`
`184`		`- return WorkloadType.AzureSqlDb;`
	`184`	`+ return WorkloadType.AzureSQLDatabase;`
`185`	`185`	`}`
`186`	`186`	`else`
`187`	`187`	`{`
Original file line number	Diff line number	Diff line change
`@@ -344,10 +344,10 @@ public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()`
`344`	`344`	`#region private`
`345`	`345`	`private void ValidateAzureSqlWorkloadType(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType type)`
`346`	`346`	`{`
`347`		`- if (type != Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSqlDb)`
	`347`	`+ if (type != Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSQLDatabase)`
`348`	`348`	`{`
`349`	`349`	`throw new ArgumentException(string.Format(Resources.UnExpectedWorkLoadTypeException,`
`350`		`- Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSqlDb.ToString(),`
	`350`	`+ Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureSQLDatabase.ToString(),`
`351`	`351`	`type.ToString()));`
`352`	`352`	`}`
`353`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,17 @@ public override void ExecuteCmdlet()`
`42`	`42`	`base.ExecuteCmdlet();`
`43`	`43`
`44`	`44`	`if (!((Container.ContainerType == ContainerType.Windows && Container.BackupManagementType == BackupManagementType.MARS) \|\|`
`45`		`- (Container.ContainerType == ContainerType.AzureSqlContainer && Container.BackupManagementType == BackupManagementType.AzureSql)))`
	`45`	`+ (Container.ContainerType == ContainerType.AzureSQL && Container.BackupManagementType == BackupManagementType.AzureSQL)))`
`46`	`46`	`{`
`47`	`47`	`throw new ArgumentException(String.Format(Resources.UnsupportedContainerException, Container.ContainerType, Container.BackupManagementType));`
`48`	`48`	`}`
`49`	`49`	`string containerName = Container.Name;`
`50`		`- if (Container.ContainerType == ContainerType.AzureSqlContainer)`
	`50`	`+`
	`51`	`+ if (Container.ContainerType == ContainerType.AzureSQL)`
	`52`	`+ {`
`51`	`53`	`containerName = ContainerConstansts.SqlContainerNamePrefix + containerName;`
	`54`	`+ }`
	`55`	`+`
`52`	`56`	`HydraAdapter.UnregisterContainers(containerName);`
`53`	`57`	`});`
`54`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,9 @@ public override void ExecuteCmdlet()`
`93`	`93`	`{`
`94`	`94`	`hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureVM);`
`95`	`95`	`}`
`96`		`- else if (WorkloadType == Models.WorkloadType.AzureSqlDb)`
	`96`	`+ else if (WorkloadType == Models.WorkloadType.AzureSQLDatabase)`
`97`	`97`	`{`
`98`		`- hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSqlDb);`
	`98`	`+ hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSQLDatabase);`
`99`	`99`	`}`
`100`	`100`	`break;`
`101`	`101`
`@@ -108,13 +108,13 @@ public override void ExecuteCmdlet()`
`108`	`108`	`}`
`109`	`109`	`hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureVM);`
`110`	`110`	`}`
`111`		`- else if (WorkloadType == Models.WorkloadType.AzureSqlDb)`
	`111`	`+ else if (WorkloadType == Models.WorkloadType.AzureSQLDatabase)`
`112`	`112`	`{`
`113`		`- if (BackupManagementType != Models.BackupManagementType.AzureSql)`
	`113`	`+ if (BackupManagementType != Models.BackupManagementType.AzureSQL)`
`114`	`114`	`{`
`115`	`115`	`throw new ArgumentException(Resources.AzureSqlUnsupportedBackupManagementTypeException);`
`116`	`116`	`}`
`117`		`- hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSqlDb);`
	`117`	`+ hydraProviderType = HydraHelpers.GetHydraProviderType(Models.WorkloadType.AzureSQLDatabase);`
`118`	`118`	`}`
`119`	`119`	`else`
`120`	`120`	`{`