Merge pull request #245 from MabOneSdk/swatim-dev1

Updating UnregisterBackupManagementServer and making SCDPM and MARS caps

Author: swatimadhukargit

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Enums.cs

@@ -39,8 +39,8 @@ public enum BackupEngineType
     public enum BackupManagementType
     {
         AzureVM = 1,
-        Mars,
-        Scdpm
+        MARS,
+        SCDPM
     }
 
     public enum WorkloadType

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonModels/Utils.cs

@@ -125,9 +125,9 @@ public static BackupManagementType GetPsBackupManagementType(string backupManage
                 case ProviderType.AzureIaasVM:
                     return BackupManagementType.AzureVM;
                 case ProviderType.MAB:
-                    return BackupManagementType.Mars;
+                    return BackupManagementType.MARS;
                 case ProviderType.DPM:
-                    return BackupManagementType.Scdpm;
+                    return BackupManagementType.SCDPM;
                 default:
                     throw new Exception("Unsupported BackupManagmentType: " + backupManagementType);
             }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs

@@ -45,9 +45,9 @@ public IPsBackupProvider GetProviderInstance(ContainerType containerType, Backup
                     providerType = PsBackupProviderTypes.IaasVm;
                     break;
                 case ContainerType.Windows:
-                    if (backupManagementType == BackupManagementType.Mars)
+                    if (backupManagementType == BackupManagementType.MARS)
                         providerType = PsBackupProviderTypes.Mab;
-                    else if (backupManagementType == BackupManagementType.Scdpm)
+                    else if (backupManagementType == BackupManagementType.SCDPM)
                         providerType = PsBackupProviderTypes.Dpm;
                     else
                         throw new ArgumentException(String.Format("BackupManagementType {0} is not expected for ContainerType {1}", backupManagementType, containerType));

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/GetAzureRmBackupManagementServer.cs

@@ -43,11 +43,11 @@ public override void ExecuteCmdlet()
                 PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
                 {  
                     {ContainerParams.ContainerType, ContainerType.Windows},
-                    {ContainerParams.BackupManagementType, BackupManagementType.Scdpm},                    
+                    {ContainerParams.BackupManagementType, BackupManagementType.SCDPM},                    
                     {ContainerParams.Name, Name}
                 }, HydraAdapter);
 
-                IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.Windows, BackupManagementType.Scdpm);
+                IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.Windows, BackupManagementType.SCDPM);
 
                 var containerModels = psBackupProvider.ListBackupManagementServers();
                 if (!string.IsNullOrEmpty(this.Name))

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmBackupManagementServer.cs

@@ -29,21 +29,22 @@ public class UnregisterAzureRmBackupManagementServer : RecoveryServicesBackupCmd
     {
         [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.RegisteredContainer)]
         [ValidateNotNullOrEmpty]
-        public AzureRmRecoveryServicesContainerBase Container { get; set; }
+        public AzureRmRecoveryServicesBackupEngineBase AzureRmBackupManagementServer { get; set; }
 
         public override void ExecuteCmdlet()
         {
             ExecutionBlock(() =>
             {
                 base.ExecuteCmdlet();
 
-                if (Container.ContainerType != ContainerType.Windows || Container.BackupManagementType != BackupManagementType.Scdpm)
+                if ((AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.DpmEngine && AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.DpmVenusEngine)||
+                    AzureRmBackupManagementServer.BackupManagementType != BackupManagementType.SCDPM)
                 {
-                    throw new ArgumentException(String.Format("Please provide Container of containerType Windows and backupManagementType Scdpm. Provided Container has containerType {0} and backupManagementType {1}", Container.ContainerType, Container.BackupManagementType));
+                    throw new ArgumentException(String.Format("Please provide AzureRmBackupManagementServer of BackupEngineType as DpmEngine or DpmVenusEngine and provide BackupManagementType as SCDPM. Provided AzureRmBackupManagementServer has BackupEngineType {0} and backupManagementType {1} which is not valid.", AzureRmBackupManagementServer.BackupEngineType, AzureRmBackupManagementServer.BackupManagementType));
                 }
 
-                string containerName = Container.Name;
-                HydraAdapter.UnregisterContainers(containerName);
+                string azureRmBackupManagementServer = AzureRmBackupManagementServer.Name;
+                HydraAdapter.UnregisterContainers(azureRmBackupManagementServer);
             });
         }
     }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs

@@ -40,9 +40,9 @@ public override void ExecuteCmdlet()
             {
                 base.ExecuteCmdlet();
 
-                if (Container.ContainerType != ContainerType.Windows || Container.BackupManagementType != BackupManagementType.Mars)
+                if (Container.ContainerType != ContainerType.Windows || Container.BackupManagementType != BackupManagementType.MARS)
                 {
-                    throw new ArgumentException(String.Format("Please provide Container of containerType Windows and backupManagementType Mars. Provided Container has containerType {0} and backupManagementType {1}", Container.ContainerType, Container.BackupManagementType));
+                    throw new ArgumentException(String.Format("Please provide Container of containerType as Windows and backupManagementType as MARS. Provided Container has containerType {0} and backupManagementType {1} which is invalid.", Container.ContainerType, Container.BackupManagementType));
                 }
                 AzureRmRecoveryServicesMabContainer mabContainer = Container as AzureRmRecoveryServicesMabContainer;
                 string containerName = mabContainer.FriendlyName;