Merge pull request #6760 from maddieclayton/getlocation

Fix issue with Get-Location

Author: Maddie Clayton

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Common.ps1

@@ -584,7 +584,24 @@ function Get-Location
 {
     param([string]$providerNamespace, [string]$resourceType, [string]$preferredLocation)
     $provider = Get-AzureRmResourceProvider -ProviderNamespace $providerNamespace
-    $resourceTypes = $provider.ResourceTypes | Where-Object { $_.Name -eq $resourceType}
+    $resourceTypes = $null
+    if ( ( $provider.ResourceTypes -ne $null ) -and ( $provider.ResourceTypes.Count -gt 0 ) )
+    {
+        $nameFound = $provider.ResourceTypes[0]| Get-Member | Where-Object { $_.Name -eq "Name" }
+        $resourceTypeNameFound = $provider.ResourceTypes[0]| Get-Member | Where-Object { $_.Name -eq "ResourceTypeName" }
+        if ( $nameFound -ne $null )
+	{
+            $resourceTypes = $provider.ResourceTypes | Where-Object { $_.Name -eq $resourceType }    
+        }
+	elseif ( $resourceTypeNameFound -ne $null )
+        {
+            $resourceTypes = $provider.ResourceTypes | Where-Object { $_.ResourceTypeName -eq $resourceType }
+        }
+	else
+	{
+            $resourceTypes = $provider.ResourceTypes | Where-Object { $_.ResourceType -eq $resourceType }
+        }
+    }
     $location = $resourceTypes.Locations | Where-Object { $_ -eq $preferredLocation }
     if ($location -eq $null)
     {

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseReplicationTests.ps1

@@ -121,9 +121,7 @@ function Test-CreateVcoreDatabaseCopy()
 function Test-CreateSecondaryDatabase()
 {
 	# Setup
-    # https://github.com/Azure/azure-powershell/issues/6382
-	#$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
-    $location = 'Southeast Asia'
+    $location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
 	$rg = Create-ResourceGroupForTest $location
 	$server = Create-ServerForTest $rg $location
 	$database = Create-DatabaseForTest $rg $server
@@ -164,9 +162,7 @@ function Test-CreateSecondaryDatabase()
 function Test-GetReplicationLink()
 {
 	# Setup
-    # https://github.com/Azure/azure-powershell/issues/6382
-	#$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
-    $location = 'Southeast Asia'
+    $location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
 	$rg = Create-ResourceGroupForTest $location
 	$server = Create-ServerForTest $rg $location
 	$database = Create-DatabaseForTest $rg $server