[Az.RecoveryServices.Backup] Fixed issues with StorageConfig (#16003)

* fixed issues with StorageConfig

added NodesList and AutoProtectionPolicy to Get-AzRecoveryServicesBackupProtectableItem Cmdlets

fixed GetItemsForContainerParamSet to support fetching the MAB backup item

fixed Get-AzRecoveryServicesBackupContainer to support BackupManagementType MAB instead of MARS

[Breaking Change Warning] Get-AzRecoveryServicesBackupJob, Get-AzRecoveryServicesBackupContainer and Get-AzRecoveryServicesBackupProtectableItem commands will only support BackupManagementType MAB instead of MARS alias

re-recorded the test ContainerTests

* update breaking version

* updated ChangeLog.md

Author: hiaga

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

@@ -669,7 +669,7 @@ public static List<ProtectableItemBase> GetProtectableItemModelList(IEnumerable<
             List<ProtectableItemBase> itemModels = new List<ProtectableItemBase>();
 
             foreach (var protectableItem in protectableItems)
-            {
+            {                
                 itemModels.Add(GetProtectableItemModel(protectableItem));
             }
 

src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.1.9-preview" />
+	<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.2.0-preview" />
     <PackageReference Include="TimeZoneConverter" Version="3.0.0" />
   </ItemGroup>
 

src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmWorkloadModels/AzureVmWorkloadContainer.cs

@@ -37,6 +37,11 @@ public class AzureVmWorkloadContainer : AzureContainer
         /// </summary>
         public string HealthStatus { get; set; }
 
+        /// <summary>
+        ///  Gets or sets host server name of the container.
+        /// </summary>
+        public string ServerName { get; set; }
+
         /// <summary>
         ///  Gets or sets additional details of a workload container.
         /// </summary>
@@ -56,6 +61,12 @@ public AzureVmWorkloadContainer(ProtectionContainerResource protectionContainerR
             Id = protectionContainerResource.Id;
             SourceResourceId = protectionContainer.SourceResourceId;
             HealthStatus = protectionContainer.HealthStatus;
+
+            if(protectionContainer.ExtendedInfo != null)
+            {
+                ServerName = protectionContainer.ExtendedInfo.HostServerName;
+            }
+            
             ExtendedInfo = new List<AzureVmWorkloadContainerExtendedInfo>();
             WorkloadsPresent = "";
             foreach (var inquiryDetail in protectionContainer.ExtendedInfo.InquiryInfo.InquiryDetails)

src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmWorkloadModels/AzureWorkloadProtectableItem.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using System.Collections.Generic;
 using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
@@ -63,6 +64,11 @@ public class AzureWorkloadProtectableItem : ProtectableItemBase
         /// </summary>
         public bool? IsAutoProtected { get; set; }
 
+        /// <summary>
+        /// Auto protection policy for protectable item
+        /// </summary>
+        public string AutoProtectionPolicy { get; set; }
+
         /// <summary>
         /// for instance or AG, indicates number of DB's present
         /// </summary>
@@ -78,6 +84,11 @@ public class AzureWorkloadProtectableItem : ProtectableItemBase
         /// </summary>
         public PreBackupValidation Prebackupvalidation { get; set; }
 
+        /// <summary>
+        /// NodesList for SQLAG protectable objects
+        /// </summary>
+        public IList<DistributedNodesInfo> NodesList { get; set; }
+
         /// <summary>
         /// Constructor. Takes the service client object representing the protected item 
         /// and converts it in to the PS protected item model
@@ -100,7 +111,8 @@ public AzureWorkloadProtectableItem(WorkloadProtectableItemResource workloadProt
             Subinquireditemcount = protectedItem.Subinquireditemcount;
             Subprotectableitemcount = protectedItem.Subprotectableitemcount;
             Prebackupvalidation = protectedItem.Prebackupvalidation;
-            ProtectableItemType = workloadProtectableItemResource.Properties.GetType().ToString();
+            ProtectableItemType = workloadProtectableItemResource.Properties.GetType().ToString();            
+
             if (workloadProtectableItemResource.Properties.GetType() == typeof(AzureVmWorkloadSQLAvailabilityGroupProtectableItem))
             {
                 ProtectableItemType = CmdletModel.ProtectableItemType.SQLAvailabilityGroup.ToString();
@@ -112,7 +124,7 @@ public AzureWorkloadProtectableItem(WorkloadProtectableItemResource workloadProt
             else if (workloadProtectableItemResource.Properties.GetType() == typeof(AzureVmWorkloadSQLDatabaseProtectableItem))
             {
                 ProtectableItemType = CmdletModel.ProtectableItemType.SQLDataBase.ToString();
-            }
+            }            
         }
     }
 }

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

@@ -87,7 +87,7 @@ public enum BackupManagementType
         MAB,
 
         /// <summary>
-        /// represents that the BackupManagementType is Not Applicable.
+        /// Represents that the BackupManagementType is Not Applicable.
         /// </summary>
         NA
     }  

src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.1.9-preview" />
+	  <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.2.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs

@@ -620,19 +620,32 @@ public void TriggerInquiry(string vaultName, string vaultResourceGroupName,
             }
         }
 
-        public List<ItemBase> GetMABProtectedItems(string vaultName, string resourceGroupName)
+        public List<ItemBase> GetMABProtectedItems(string vaultName, string resourceGroupName, ContainerBase container = null)
         {
             ODataQuery<ProtectedItemQueryObject> queryParams =
                 new ODataQuery<ProtectedItemQueryObject>(
-                    q => q.BackupManagementType == ServiceClientModel.BackupManagementType.MAB);
-                            
+                    q => q.BackupManagementType == ServiceClientModel.BackupManagementType.MAB);                            
 
             List<ProtectedItemResource> protectedItems = ServiceClientAdapter.ListProtectedItem(
                 queryParams,
                 null,
                 vaultName: vaultName,
                 resourceGroupName: resourceGroupName);
 
+            // filter by Container Name if given
+            if (container != null)
+            {
+                protectedItems = protectedItems.Where(protectedItem =>
+                {
+                    Dictionary<CmdletModel.UriEnums, string> dictionary = HelperUtils.ParseUri(protectedItem.Id);
+                    string containerUri = HelperUtils.GetContainerUri(dictionary, protectedItem.Id);
+
+                    var delimIndex = containerUri.IndexOf(';');
+                    string containerName = containerUri.Substring(delimIndex + 1);                    
+                    return containerName.ToLower().Equals(container.Name.ToLower());
+                }).ToList();
+            }
+
             return ConversionHelpers.GetItemModelList(protectedItems);
         }
     }

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

@@ -73,7 +73,7 @@ public IPsBackupProvider GetProviderInstance
                     }
                     break;
                 case ContainerType.Windows:
-                    if (backupManagementType == BackupManagementType.MARS)
+                    if (backupManagementType == BackupManagementType.MARS || backupManagementType == BackupManagementType.MAB)
                     {
                         providerType = PsBackupProviderTypes.Mab;
                     }

src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.1.9-preview" />
+	<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.2.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ContainerAPIs.cs

@@ -72,6 +72,28 @@ public IEnumerable<ProtectionContainerResource> ListContainers(
             return HelperUtils.GetPagedList(listAsync, listNextAsync);
         }
 
+        /// <summary>
+        /// Fetches a particular protection container in the vault
+        /// </summary>
+        /// <param name="vaultName"></param>
+        /// <param name="resourceGroupName"></param>
+        /// <param name="containerName"></param>
+        /// <returns></returns>
+        public ProtectionContainerResource GetContainer(
+            string vaultName = null,
+            string resourceGroupName = null,
+            string containerName = null)
+        {
+            ProtectionContainerResource container = BmsAdapter.Client.ProtectionContainers.GetWithHttpMessagesAsync(
+                    vaultName ?? BmsAdapter.GetResourceName(),
+                    resourceGroupName ?? BmsAdapter.GetResourceGroupName(),
+                    AzureFabricName,
+                    containerName,                    
+                    cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
+
+            return container;
+        }
+
         /// <summary>
         /// Fetches backup engines in the vault according to the query params
         /// </summary>