Merge pull request #8611 from MabOneSdk/mercury_dev_test

[Recoveryservices] Removed VMappContainer check in get protectable item and adding PM reviews

Author: Maddie Clayton

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

@@ -367,7 +367,7 @@ public enum BackupType
     /// </summary>
     public enum ProtectableItemType
     {
-        SQLDataBase,
+        SQLDataBase = 1,
         SQLInstance,
         SQLAvailabilityGroup
     }

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -554,12 +554,15 @@ Please contact Microsoft for further assistance.</value>
     <value>The specified workload is already registered in the given resource ID</value>
   </data>
   <data name="AzureWorkloadRestoreProtectableItemException" xml:space="preserve">
-    <value>Provide SQLInstance or SQLAvailabilityGroup protectable item in TargetItem</value>
+    <value>Provide SQLInstance protectable item in TargetItem</value>
   </data>
   <data name="RegisterContainerMessage" xml:space="preserve">
     <value>Registering container</value>
   </data>
   <data name="RegisterContainerWarning" xml:space="preserve">
     <value>Are you sure you want to disable protection for the container '{0}'</value>
   </data>
+<data name="AzureWorkloadRestoreLocationException" xml:space="preserve">
+    <value>Please provide the target of the restore operation using the switch -OriginalWorkloadRestore or -AlternateWorkloadRestore</value>
+  </data>
 </root>

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -244,5 +244,36 @@ public List<ProtectionIntentResource> ListProtectionIntent(
 
             return HelperUtils.GetPagedList(listAsync, listNextAsync);
         }
+
+        /// <summary>
+        /// Lists workload items according to the query filter and the pagination params
+        /// </summary>
+        /// <param name="containrName">Query filter</param>
+        /// <param name="queryFilter">Query filter</param>
+        /// <param name="skipToken">Skip token for pagination</param>
+        /// <returns>List of protectable items</returns>
+        public List<WorkloadItemResource> ListWorkloadItem(
+            string containerName,
+            ODataQuery<BMSWorkloadItemQueryObject> queryFilter,
+            string skipToken = default(string),
+            string vaultName = null,
+            string resourceGroupName = null)
+        {
+            Func<RestAzureNS.IPage<WorkloadItemResource>> listAsync =
+                () => BmsAdapter.Client.BackupWorkloadItems.ListWithHttpMessagesAsync(
+                    vaultName ?? BmsAdapter.GetResourceName(),
+                    resourceGroupName ?? BmsAdapter.GetResourceGroupName(),
+                    AzureFabricName,
+                    containerName,
+                    queryFilter,
+                    cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
+
+            Func<string, RestAzureNS.IPage<WorkloadItemResource>> listNextAsync =
+                nextLink => BmsAdapter.Client.BackupWorkloadItems.ListNextWithHttpMessagesAsync(
+                    nextLink,
+                    cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
+
+            return HelperUtils.GetPagedList(listAsync, listNextAsync);
+        }
     }
 }

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

@@ -17,6 +17,7 @@ $resourceGroupName = "pstestwlRG1bca8"
 $vaultName = "pstestwlRSV1bca8"
 $resourceId = "/subscriptions/da364f0f-307b-41c9-9d47-b7413ec45535/resourceGroups/pstestwlRG1bca8/providers/Microsoft.Compute/virtualMachines/pstestwlvm1bca8"
 $policyName = "HourlyLogBackup"
+$instanceName = "sqlinstance;mssqlserver"
 
 function Test-AzureVmWorkloadProtectableItem
 {
@@ -58,6 +59,16 @@ function Test-AzureVmWorkloadProtectableItem
 			-ItemType "SQLDataBase";
 		Assert-True { $protectableItems.ProtectableItemType -contains "SQLDataBase" }
 		Assert-False { $protectableItems.ProtectableItemType -contains "SQLInstance" }
+
+		$protectableItems = Get-AzRecoveryServicesBackupProtectableItem `
+			-VaultId $vault.ID `
+			-Container $container `
+			-WorkloadType "MSSQL" `
+			-Name $instanceName `
+			-ServerName $containerName;
+
+		Assert-True { $protectableItems.ProtectableItemType -contains "SQLInstance" }
+		Assert-True { $protectableItems.Count -eq 1}
 	}
 	finally
 	{