Test location parameter in deleted apps cmdlets

Author: Nicholas King

src/Websites/Websites.Test/ScenarioTests/Common.ps1

@@ -109,7 +109,7 @@ function Get-WebLocation
 		}
 	}
 
-	return "WestUS"
+	return "West US"
 }
 
 <#
@@ -133,7 +133,7 @@ function Get-SecondaryLocation
 		}
 	}
 
-	return "WestUS"
+	return "West US"
 }
 
 <#

src/Websites/Websites.Test/ScenarioTests/WebAppBackupRestoreTests.ps1

@@ -399,12 +399,12 @@ function Test-GetDeletedWebApp
 		Remove-AzWebAppSlot -ResourceGroupName $rgname -Name $wname -Slot $slotName -Force
 		Remove-AzWebApp -ResourceGroupName $rgname -Name $wname -Force
 
-		$deletedApp = Get-AzDeletedWebApp -ResourceGroupName $rgname -Name $wname -Slot "Production"
+		$deletedApp = Get-AzDeletedWebApp -ResourceGroupName $rgname -Name $wname -Slot "Production" -Location $location
 		Assert-NotNull $deletedApp
 		Assert-AreEqual $rgname $deletedApp.ResourceGroupName
 		Assert-AreEqual $wname $deletedApp.Name
 
-		$deletedSlot = Get-AzDeletedWebApp -ResourceGroupName $rgname -Name $wname -Slot $slotName
+		$deletedSlot = Get-AzDeletedWebApp -ResourceGroupName $rgname -Name $wname -Slot $slotName -Location $location
 		Assert-NotNull $deletedSlot
 		Assert-AreEqual $rgname $deletedSlot.ResourceGroupName
 		Assert-AreEqual $wname $deletedSlot.Name
@@ -462,14 +462,14 @@ function Test-RestoreDeletedWebAppToExisting
 		if ($isRecordMode) 
 		{
 			# Need extra time for restore operation to resolve globally
-			Start-Sleep -Seconds 300
+			Start-Sleep -Seconds 900
 		}
 
 		# Test the FromDeletedResourceName parameter set
 		$restoredSlot = Restore-AzDeletedWebApp -ResourceGroupName $rgname -Name $delName -Slot $delSlot -TargetResourceGroupName $rgname -TargetName $wname -TargetSlot $slotName -Force
 		if ($isRecordMode) 
 		{
-			Start-Sleep -Seconds 300
+			Start-Sleep -Seconds 900
 		}
 
 		Assert-NotNull $restoredApp
@@ -533,7 +533,7 @@ function Test-RestoreDeletedWebAppToNew
 		if ($isRecordMode) 
 		{
 			# Need extra time for restore operation to resolve globally, or cleanup will be blocked
-			Start-Sleep -Seconds 300
+			Start-Sleep -Seconds 900
 		}
 	}
 	finally

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestGetDeletedWebApp.json

@@ -51,7 +51,16 @@ public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
-            IEnumerable<string> locations = ResourcesClient.GetDeletedSitesLocations();
+            IEnumerable<string> locations;
+            if (string.IsNullOrEmpty(Location))
+            {
+                locations = ResourcesClient.GetDeletedSitesLocations();
+            }
+            else
+            {
+                locations = new List<string> { Location };
+            }
+
             IEnumerable<PSAzureDeletedWebApp> deletedSites = WebsitesClient.GetDeletedSitesFromLocations(locations)
                 .Where(ds => ds.DeletedSiteId.HasValue)
                 .Select(ds => new PSAzureDeletedWebApp(ds, DefaultContext.Subscription.Id));
@@ -68,10 +77,6 @@ public override void ExecuteCmdlet()
             {
                 deletedSites = deletedSites.Where(ds => string.Equals(Slot, ds.Slot, StringComparison.InvariantCultureIgnoreCase));
             }
-            if (!string.IsNullOrEmpty(Location))
-            {
-                deletedSites = deletedSites.Where(ds => string.Equals(Location, ds.Location, StringComparison.InvariantCultureIgnoreCase));
-            }
 
             WriteObject(deletedSites, true);
         }

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestRestoreDeletedWebAppToExisting.json

@@ -128,7 +128,16 @@ private string GetDeletedSiteResourceId()
             switch (ParameterSetName)
             {
                 case FromDeletedResourceNameParameterSet:
-                    IEnumerable<string> locations = ResourcesClient.GetDeletedSitesLocations();
+                    IEnumerable<string> locations;
+                    if (string.IsNullOrEmpty(Location))
+                    {
+                        locations = ResourcesClient.GetDeletedSitesLocations();
+                    }
+                    else
+                    {
+                        locations = new List<string> { Location };
+                    }
+
                     var deletedSites = WebsitesClient.GetDeletedSitesFromLocations(locations).Where(ds =>
                     {
                         bool match = string.Equals(ds.ResourceGroup, ResourceGroupName, StringComparison.InvariantCultureIgnoreCase) &&
@@ -137,10 +146,6 @@ private string GetDeletedSiteResourceId()
                         {
                             match = match && string.Equals(ds.Slot, Slot, StringComparison.InvariantCultureIgnoreCase);
                         }
-                        if (!string.IsNullOrEmpty(Location))
-                        {
-                            match = match && string.Equals(ds.GeoRegionName, Location, StringComparison.InvariantCultureIgnoreCase);
-                        }
                         return match;
                     });
                     if (!deletedSites.Any())