Merge pull request #279 from MabOneSdk/pikumar-dev1

Pikumar dev1

Author: pikumarmsft16

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs

@@ -57,6 +57,10 @@ public static AzureRmRecoveryServicesBackupEngineBase GetBackupEngineModel(Backu
                 {
                     backupEngineModel = new AzureRmRecoveryServicesDpmBackupEngine(backupEngine);
                 }
+                else if (backupEngine.Properties.GetType() == (typeof(AzureBackupServerEngine)))
+                {
+                    backupEngineModel = new AzureRmRecoveryServicesAzureBackupServerEngine(backupEngine);
+                }
             }
 
             return backupEngineModel;

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

@@ -31,7 +31,8 @@ public enum BackupManagementType
     {
         AzureVM = 1,
         MARS,
-        SCDPM
+        SCDPM,
+        AzureBackupServer,
     }
 
     public enum BackupEngineType

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

@@ -139,6 +139,8 @@ Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType p
                     return BackupManagementType.MARS;
                 case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.DPM:
                     return BackupManagementType.SCDPM;
+                case Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureBackupServer:
+                    return BackupManagementType.AzureBackupServer;
                 default:
                     throw new Exception("Unsupported BackupManagmentType: " + backupManagementType);
             }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/AzureRmRecoveryServicesDpmBackupEngine.cs

@@ -41,4 +41,25 @@ public AzureRmRecoveryServicesDpmBackupEngine(BackupEngineResource backupEngine)
             Status = dpmBackupEngine.RegistrationStatus;
         }
     }
+
+    public class AzureRmRecoveryServicesAzureBackupServerEngine : AzureRmRecoveryServicesBackupEngineBase
+    {
+        /// <summary>
+        /// Friendly name of the container
+        /// </summary>
+        public string FriendlyName { get; set; }
+
+        /// <summary>
+        /// Registration Status
+        /// </summary>
+        public string Status { get; set; }
+
+        public AzureRmRecoveryServicesAzureBackupServerEngine(BackupEngineResource backupEngine)
+            : base(backupEngine)
+        {
+            AzureBackupServerEngine azureBackupServerEngine = (AzureBackupServerEngine)backupEngine.Properties;
+            FriendlyName = azureBackupServerEngine.FriendlyName;
+            Status = azureBackupServerEngine.RegistrationStatus;
+        }
+    }
 }

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

@@ -91,8 +91,6 @@ public ProtectionPolicyResponse ModifyPolicy()
 
             BackupEngineListQueryParams queryParams = new BackupEngineListQueryParams();
 
-            queryParams.BackupManagementType = Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.DPM.ToString();
-
             var listResponse = HydraAdapter.ListBackupEngines(queryParams);
 
             List<AzureRmRecoveryServicesBackupEngineBase> backupEngineModels = ConversionHelpers.GetBackupEngineModelList(listResponse);

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

@@ -44,7 +44,10 @@ public IPsBackupProvider GetProviderInstance(ContainerType containerType, Backup
             switch (containerType)
             {
                 case ContainerType.AzureVM:
-                    providerType = PsBackupProviderTypes.IaasVm;
+                    if (backupManagementType == BackupManagementType.AzureVM || backupManagementType == null)
+                        providerType = PsBackupProviderTypes.IaasVm;
+                    else
+                        throw new ArgumentException(String.Format(Resources.BackupManagementTypeRequiredForContainerType, containerType));
                     break;
                 case ContainerType.Windows:
                     if (backupManagementType == BackupManagementType.MARS)

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

@@ -36,7 +36,8 @@ public class GetAzureRmRecoveryServicesBackupContainer : RecoveryServicesBackupC
 
         [Parameter(Mandatory = false, Position = 2, HelpMessage = ParamHelpMsg.Container.BackupManagementType)]
         [ValidateNotNullOrEmpty]
-        public BackupManagementType BackupManagementType { get; set; }
+        [ValidateSet("AzureVM", "MARS")]
+        public string BackupManagementType { get; set; }
 
         [Parameter(Mandatory = false, Position = 3, HelpMessage = ParamHelpMsg.Container.Name)]
         [ValidateNotNullOrEmpty]
@@ -56,16 +57,24 @@ public override void ExecuteCmdlet()
             {
                 base.ExecuteCmdlet();
 
+                BackupManagementType? backupManagementTypeNullable = null;
+                BackupManagementType backupManagementType;
+                if (BackupManagementType != null)
+                {
+                    Enum.TryParse<BackupManagementType>(BackupManagementType, out backupManagementType);
+                    backupManagementTypeNullable = backupManagementType;
+                }
+
                 PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
                 {  
                     {ContainerParams.ContainerType, ContainerType},
-                    {ContainerParams.BackupManagementType, BackupManagementType},
+                    {ContainerParams.BackupManagementType, backupManagementTypeNullable},
                     {ContainerParams.Name, Name},
                     {ContainerParams.ResourceGroupName, ResourceGroupName},
                     {ContainerParams.Status, Status},
                 }, HydraAdapter);
 
-                IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType, BackupManagementType);
+                IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType, backupManagementTypeNullable);
                 var containerModels = psBackupProvider.ListProtectionContainers();
 
                 if (containerModels.Count == 1)

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

@@ -38,8 +38,10 @@ public override void ExecuteCmdlet()
             {
                 base.ExecuteCmdlet();
 
-                if ((AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.DpmBackupEngine.ToString() && AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.AzureBackupServerEngine.ToString())||
-                    AzureRmBackupManagementServer.BackupManagementType != BackupManagementType.SCDPM)
+                if ((AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.DpmBackupEngine.ToString() && 
+                    AzureRmBackupManagementServer.BackupEngineType != BackupEngineType.AzureBackupServerEngine.ToString())||
+                    AzureRmBackupManagementServer.BackupManagementType.ToString() != BackupManagementType.SCDPM.ToString() &&
+                    AzureRmBackupManagementServer.BackupManagementType.ToString() != BackupManagementType.AzureBackupServer.ToString())
                 {
                     throw new ArgumentException(String.Format(Resources.UnsupportedAzureRmBackupManagementServerException, AzureRmBackupManagementServer.BackupEngineType, AzureRmBackupManagementServer.BackupManagementType));
                 }