Merge pull request #266 from MabOneSdk/anudeeb-dev1

Get Item Bug Fixes and Test Records

Author: Samuel Anudeep

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

@@ -447,24 +447,40 @@ public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()
                 return containerUri.Contains(container.Name);
             }).ToList();
 
-            List<AzureRmRecoveryServicesBackupItemBase> itemModels = ConversionHelpers.GetItemModelList(protectedItems, container);
+            List<ProtectedItemResponse> protectedItemGetResponses = new List<ProtectedItemResponse>();
 
             // 2. Filter by item's friendly name
             if (!string.IsNullOrEmpty(name))
             {
-                itemModels = itemModels.Where(itemModel =>
+                protectedItems = protectedItems.Where(protectedItem =>
                 {
-                    return ((AzureRmRecoveryServicesBackupIaasVmItem)itemModel).Name == name;
+                    Dictionary<UriEnums, string> dictionary = HelperUtils.ParseUri(protectedItem.Id);
+                    string protectedItemUri = HelperUtils.GetProtectedItemUri(dictionary, protectedItem.Id);
+                    return protectedItemUri.Contains(name);
                 }).ToList();
 
                 GetProtectedItemQueryParam getItemQueryParams = new GetProtectedItemQueryParam();
                 getItemQueryParams.Expand = "extendedinfo";
 
+                for (int i = 0; i < protectedItems.Count; i++)
+                {
+                    Dictionary<UriEnums, string> dictionary = HelperUtils.ParseUri(protectedItems[i].Id);
+                    string containerUri = HelperUtils.GetContainerUri(dictionary, protectedItems[i].Id);
+                    string protectedItemUri = HelperUtils.GetProtectedItemUri(dictionary, protectedItems[i].Id);
+
+                    var getResponse = HydraAdapter.GetProtectedItem(containerUri, protectedItemUri, getItemQueryParams);
+                    protectedItemGetResponses.Add(getResponse);
+                }
+            }
+
+            List<AzureRmRecoveryServicesBackupItemBase> itemModels = ConversionHelpers.GetItemModelList(protectedItems, container);
+
+            if (!string.IsNullOrEmpty(name))
+            {
                 for (int i = 0; i < itemModels.Count; i++)
                 {
-                    var getResponse = HydraAdapter.GetProtectedItem(container.Name, itemModels[i].Name, getItemQueryParams);
                     AzureRmRecoveryServicesBackupIaasVmItemExtendedInfo extendedInfo = new AzureRmRecoveryServicesBackupIaasVmItemExtendedInfo();
-                    var hydraExtendedInfo = ((AzureIaaSVMProtectedItem)getResponse.Item.Properties).ExtendedInfo;
+                    var hydraExtendedInfo = ((AzureIaaSVMProtectedItem)protectedItemGetResponses[i].Item.Properties).ExtendedInfo;
                     if (hydraExtendedInfo.OldestRecoveryPoint.HasValue)
                     {
                         extendedInfo.OldestRecoveryPoint = hydraExtendedInfo.OldestRecoveryPoint;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

@@ -190,6 +190,10 @@
       <Project>{30b92759-50b3-494e-b9f0-ec9a2ce9d57b}</Project>
       <Name>Commands.RecoveryServices.Backup.Models</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Commands.RecoveryServices.Backup\Commands.RecoveryServices.Backup.Cmdlets.csproj">
+      <Project>{3b3e879a-f856-46bf-aff9-8ad6760cf7b9}</Project>
+      <Name>Commands.RecoveryServices.Backup.Cmdlets</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.ps1

@@ -14,13 +14,13 @@
 
 function Test-GetItemScenario
 {
-	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
+	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "PsTestRsVault";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 
-	$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
-	Assert-AreEqual $namedContainer.FriendlyName "mylinux1";
+	$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "AzureVM" -Status "Registered";
+	Assert-AreEqual $namedContainer[2].FriendlyName "mkheranirmvm1";
 
-	$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM";
+	$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer[2] -WorkloadType "AzureVM" -Name "mkheranirmvm1";
 	echo $item.Name;
 }