Merge pull request #261 from MabOneSdk/pragrawa-dev1

Bug Fix for get-item

Author: pragrawa

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

@@ -439,15 +439,16 @@ public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()
                 }
             } while (skipToken != null);
 
-            List<AzureRmRecoveryServicesBackupItemBase> itemModels = ConversionHelpers.GetItemModelList(protectedItems, container);
-
             // 1. Filter by container
-            itemModels = itemModels.Where(itemModel =>
+            protectedItems = protectedItems.Where(protectedItem =>
             {
-                // return itemModel.ContainerName == container.Name;
-                return container.Name.Contains(itemModel.ContainerName);
+                Dictionary<UriEnums, string> dictionary = HelperUtils.ParseUri(protectedItem.Id);
+                string containerUri = HelperUtils.GetContainerUri(dictionary, protectedItem.Id);
+                return containerUri.Contains(container.Name);
             }).ToList();
 
+            List<AzureRmRecoveryServicesBackupItemBase> itemModels = ConversionHelpers.GetItemModelList(protectedItems, container);
+
             // 2. Filter by item's friendly name
             if (!string.IsNullOrEmpty(name))
             {

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

@@ -17,7 +17,7 @@ function Test-GetItemScenario
 	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 
-	$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
+	$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
 	Assert-AreEqual $namedContainer.FriendlyName "mylinux1";
 
 	$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM";
@@ -29,7 +29,7 @@ function Test-EnableAzureVMProtectionScenario
 	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 
-	$policy = Get-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1"	
+	$policy = Get-AzureRmRecoveryServicesBackupProtectionPolicy -Name "pwtest1"	
 
 	$job = Enable-AzureRmRecoveryServicesBackupProtection -Name "mylinux1" -ResourceGroupName "mylinux1"  -WorkloadType "AzureVM" -Policy $policy;
 	Assert-AreEqual $job.Status "Completed";
@@ -56,7 +56,7 @@ function Test-GetAzureVMRecoveryPointsScenario
 	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 
-	$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
+	$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
 	Assert-AreEqual $namedContainer.FriendlyName "mylinux1";
 
 	$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM";
@@ -72,7 +72,7 @@ function Test-RestoreAzureVMRItemScenario
 	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 
-	$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
+	$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
 	Assert-AreEqual $namedContainer.FriendlyName "mylinux1";
 
 	$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM";
@@ -90,7 +90,7 @@ function Test-BackupItemScenario
 	$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "pstestrg" -Name "pstestrsvault";
 	Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
 
-	$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "AzureVM" -Status "Registered" -Name "pstestv2vm1";
+	$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "AzureVM" -Status "Registered" -Name "pstestv2vm1";
 	Assert-AreEqual $namedContainer.FriendlyName "pstestv2vm1";
 
 	$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM";