Merge pull request #243 from MabOneSdk/pikumar-dev1

Pikumar dev1

Author: pikumarmsft16

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

@@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureRmBackupManagementServer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>), typeof(AzureRmRecoveryServicesContainerBase))]
     public class GetAzureRmBackupManagementServer : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Container.Name)]
+        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Container.Name)]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
@@ -50,15 +50,14 @@ public override void ExecuteCmdlet()
                 IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.Windows, BackupManagementType.Scdpm);
 
                 var containerModels = psBackupProvider.ListBackupManagementServers();
-
-                if (containerModels.Count == 1)
-                {
-                    WriteObject(containerModels.First());
-                }
-                else
+                if (!string.IsNullOrEmpty(this.Name))
                 {
-                    WriteObject(containerModels);
+                    if (containerModels != null)
+                    {
+                        containerModels = containerModels.Where(x => x.Name == this.Name).ToList();
+                    }
                 }
+                WriteObject(containerModels);
             });
         }
     }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs

@@ -42,8 +42,10 @@ public IEnumerable<ProtectionContainerResource> ListContainers(ProtectionContain
         /// <returns></returns>
         public IEnumerable<BackupEngineResource> ListBackupEngines(BackupEngineListQueryParams queryParams)
         {
-            var listResponse = BmsAdapter.Client.BackupEngine.ListAsync(BmsAdapter.GetResourceGroupName(), BmsAdapter.GetResourceName(), queryParams,
-                 null, BmsAdapter.GetCustomRequestHeaders(), BmsAdapter.CmdletCancellationToken).Result;
+            PaginationRequest paginationParam = new PaginationRequest();
+            paginationParam.Top = "200";
+            var listResponse = BmsAdapter.Client.BackupEngine.ListAsync(BmsAdapter.GetResourceGroupName(), BmsAdapter.GetResourceName(), queryParams, paginationParam,
+                BmsAdapter.GetCustomRequestHeaders(), BmsAdapter.CmdletCancellationToken).Result;
             return listResponse.ItemList.BackupEngines;
         }
 

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

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

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

@@ -23,11 +23,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
 {
     public class AzureRmRecoveryServicesDpmBackupEngine : AzureRmRecoveryServicesBackupEngineBase
     {
-        /// <summary>
-        /// Resource Group where the Container is present
-        /// </summary>
-        public string ResourceGroupName { get; set; }
-
         /// <summary>
         /// Friendly name of the container
         /// </summary>
@@ -36,15 +31,14 @@ public class AzureRmRecoveryServicesDpmBackupEngine : AzureRmRecoveryServicesBac
         /// <summary>
         /// Registration Status
         /// </summary>
-        public BackupEngineRegistrationStatus Status { get; set; }
+        public string Status { get; set; }
 
         public AzureRmRecoveryServicesDpmBackupEngine(BackupEngineResource backupEngine)
             : base(backupEngine)
         {
             DpmBackupEngine dpmBackupEngine = (DpmBackupEngine)backupEngine.Properties;
-            ResourceGroupName = IdUtils.GetResourceGroupName(backupEngine.Id);
             FriendlyName = dpmBackupEngine.FriendlyName;
-            Status = EnumUtils.GetEnum<BackupEngineRegistrationStatus>(dpmBackupEngine.RegistrationStatus);
+            Status = dpmBackupEngine.RegistrationStatus;
         }
     }
 }

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

@@ -94,9 +94,6 @@ public ProtectionPolicyResponse ModifyPolicy()
 
             var listResponse = HydraAdapter.ListBackupEngines(queryParams);
 
-            queryParams.ProviderType = ProviderType.DPM.ToString();
-
-
             List<AzureRmRecoveryServicesBackupEngineBase> backupEngineModels = ConversionHelpers.GetBackupEngineModelList(listResponse);
 
             return backupEngineModels;