Fix Get-Location

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

@@ -41,13 +41,7 @@ function Get-AzureRmResourceProvider
   }
   PROCESS {
     $getTask = $client.Providers.GetAsync($ProviderNamespace, [System.Threading.CancellationToken]::None)
-    $pr = $getTask.Result
-    if($pr -eq $null) {
-      $provider = $null
-    } else {
-      $provider = Get-Provider $pr.Provider.Namespace
-    }
-    Write-Output $provider
+    Write-Output $getTask.Result.Provider
   }
   END {}
 }
@@ -143,13 +137,6 @@ function Get-ResourceGroup {
   return $rg
 }
 
-function Get-Provider {
-  param([string] $name)
-  $rtype = New-Object PSObject -Property @{"ResourceTypeName" = "virtualMachines"; "Locations" = @("East US"); "ApiVersions" = @("2015-01-01"); }
-  $pr = New-Object PSObject -Property @{"ProviderNamespace" = $name; "RegistrationState" = "Registered"; "Locations" = @("East US"); "ResourceTypes" = $rtype;}
-  return $pr
-}
-
 function List-ResourceGroup {
   $rg = New-Object PSObject -Property @{"ResourceGroupName" = $name; "Location" = $location; }
   return $rg

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

@@ -584,7 +584,7 @@ function Get-Location
 {
     param([string]$providerNamespace, [string]$resourceType, [string]$preferredLocation)
     $provider = Get-AzureRmResourceProvider -ProviderNamespace $providerNamespace
-    $resourceTypes = $provider.ResourceTypes | Where-Object { $_.ResourceTypeName -eq $resourceType}
+    $resourceTypes = $provider.ResourceTypes | Where-Object { $_.Name -eq $resourceType}
     $location = $resourceTypes.Locations | Where-Object { $_ -eq $preferredLocation }
     if ($location -eq $null)
     {

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestCommon.ps1

@@ -505,47 +505,47 @@ function Get-ResourceProviderLocation
 
 function Get-ComputeVMLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines";
+     Get-Location "Microsoft.Compute" "virtualMachines" "East US";
 }
 
 function Get-ComputeAvailabilitySetLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/availabilitySets";
+     Get-Location "Microsoft.Compute" "availabilitySets" "West US";
 }
 
 function Get-ComputeVMExtensionLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/extensions";
+     Get-Location "Microsoft.Compute" "virtualMachines/extensions" "West US";
 }
 
 function Get-ComputeVMDiagnosticSettingLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/diagnosticSettings";
+     Get-Location "Microsoft.Compute" "virtualMachines/diagnosticSettings" "West US";
 }
 
 function Get-ComputeVMMetricDefinitionLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/metricDefinitions";
+     Get-Location "Microsoft.Compute" "virtualMachines/metricDefinitions" "West US";
 }
 
 function Get-ComputeOperationLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/locations/operations";
+     Get-Location "Microsoft.Compute" "locations/operations" "West US";
 }
 
 function Get-ComputeVMSizeLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/locations/vmSizes";
+     Get-Location "Microsoft.Compute" "locations/vmSizes" "West US";
 }
 
 function Get-ComputeUsageLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/locations/usages";
+     Get-Location "Microsoft.Compute" "locations/usages" "West US";
 }
 
 function Get-ComputePublisherLocation
 {
-     Get-ResourceProviderLocation "Microsoft.Compute/locations/publishers";
+     Get-Location "Microsoft.Compute" "locations/publishers" "West US";
 }
 
 function Get-SubscriptionIdFromResourceGroup

src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/DRConfigurationTests.ps1

@@ -49,7 +49,6 @@ function WaitforStatetoBeSucceded_namespace
 
 }
 
-
 <#
 .SYNOPSIS
 Tests EventHubs DRConfiguration Create List Remove operations.
@@ -58,8 +57,8 @@ Tests EventHubs DRConfiguration Create List Remove operations.
 function DRConfigurationTests
 {
 	# Setup
-	$location_south =  "South Central US" #Get-Location "Microsoft.ServiceBus" "namespaces" "South Central US"
-	$location_north = "North Central US" #Get-Location "Microsoft.ServiceBus" "namespaces" "North Central US"
+	$location_south =  Get-Location "Microsoft.ServiceBus" "namespaces" "South Central US"
+	$location_north = Get-Location "Microsoft.ServiceBus" "namespaces" "North Central US"
 	$resourceGroupName = getAssetName
 	$namespaceName1 = getAssetName "Eventhub-Namespace-"
 	$namespaceName2 = getAssetName "Eventhub-Namespace-"

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

@@ -30,38 +30,6 @@ function Get-ResourceName
     return getAssetName
 }
 
-<#
-.SYNOPSIS
-Gets the default location for a provider
-#>
-function Get-ProviderLocation($provider)
-{
-	$assemblies = [AppDomain]::Currentdomain.GetAssemblies() | Select-Object FullName | ForEach-Object { $_.FullName.Substring(0, $_.FullName.IndexOf(',')) }
-    if ($assemblies -notcontains 'Microsoft.Azure.Test.HttpRecorder.HttpMockServer' `
-		-or $assemblies -notcontains 'Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode' `
-		-or [Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
-	{
-		$namespace = $provider.Split("/")[0]  
-		if($provider.Contains("/"))  
-		{  
-			$type = $provider.Substring($namespace.Length + 1)  
-			$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}  
-
-			if ($location -eq $null) 
-			{  
-				return "West US"  
-			} else 
-			{  
-				return $location.Locations[0]  
-			}  
-		}
-
-		return "West US"
-	}
-
-	return "WestUS"
-}
-
 <#
 .SYNOPSIS
 Gets valid application display name

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.ps1

@@ -20,7 +20,7 @@ function Test-CreatesNewSimpleResourceGroup
 {
     # Setup
     $rgname = Get-ResourceGroupName
-    $location = Get-ProviderLocation ResourceManagement
+    $location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 
     try 
     {
@@ -47,7 +47,7 @@ function Test-UpdatesExistingResourceGroup
 {
     # Setup
     $rgname = Get-ResourceGroupName
-    $location = Get-ProviderLocation ResourceManagement
+    $location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 
     try 
     {
@@ -82,7 +82,7 @@ function Test-CreatesAndRemoveResourceGroupViaPiping
     # Setup
     $rgname1 = Get-ResourceGroupName
     $rgname2 = Get-ResourceGroupName
-    $location = Get-ProviderLocation ResourceManagement
+    $location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 
     # Test
     New-AzureRmResourceGroup -Name $rgname1 -Location $location
@@ -201,7 +201,7 @@ function Test-NewDeploymentAndProviderRegistration
     # Setup
     $rgname = Get-ResourceGroupName
     $rname = Get-ResourceName
-    $location = Get-ProviderLocation ResourceManagement
+    $location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
     $template = "Microsoft.Cache.0.4.0-preview"
     $provider = "microsoft.cache"
 
@@ -271,7 +271,7 @@ function Test-FindResourceGroup
     # Setup
     $rgname = Get-ResourceGroupName
 	$rgname2 = Get-ResourceGroupName
-    $location = Get-ProviderLocation ResourceManagement
+    $location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$originalResorcrGroups = Find-AzureRmResourceGroup
 	$originalCount = @($originalResorcrGroups).Count 
 
@@ -337,7 +337,7 @@ function Test-ExportResourceGroup
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -370,7 +370,7 @@ function Test-ResourceGroupWithPositionalParams
 {
     # Setup
     $rgname = Get-ResourceGroupName
-    $location = "West US"
+    $location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 
     try
     {

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceLockTests.ps1

@@ -21,7 +21,7 @@ function Test-ResourceLockCRUD
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 
 	$rg = New-AzureRMResourceGroup -Name $rgname -Location $rglocation
@@ -64,7 +64,7 @@ function Test-ResourceLockNonExisting
 {
 	# Setup
 	$rgname = Get-ResourceGroupName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 
 	$rg = New-AzureRMResourceGroup -Name $rgname -Location $rglocation
 	Assert-AreEqual $rgname $rg.ResourceGroupName

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.ps1

@@ -23,8 +23,8 @@ function Test-CreatesNewSimpleResource
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
-	$location = Get-ProviderLocation "Microsoft.Sql/servers"
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+	$location = Get-Location "Microsoft.Sql" "servers" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Microsoft.Sql/servers"
 
@@ -57,10 +57,9 @@ function Test-CreatesNewComplexResource
 	$rgname = Get-ResourceGroupName
 	$rnameParent = Get-ResourceName
 	$rnameChild = Get-ResourceName
-	$resourceTypeParent = "Microsoft.Sql/servers"
 	$resourceTypeChild = "Microsoft.Sql/servers/databases"
-	$rglocation = Get-ProviderLocation ResourceManagement
-	$location = Get-ProviderLocation $resourceTypeParent
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+	$location = Get-Location "Microsoft.Sql" "servers" "West US"
 	$apiversion = "2014-04-01"
 
 	# Test
@@ -108,10 +107,9 @@ function Test-GetResourcesViaPiping
 	$rgname = Get-ResourceGroupName
 	$rnameParent = Get-ResourceName
 	$rnameChild = Get-ResourceName
-	$resourceTypeParent = "Microsoft.Sql/servers"
 	$resourceTypeChild = "Microsoft.Sql/servers/databases"
-	$rglocation = Get-ProviderLocation ResourceManagement
-	$location = Get-ProviderLocation $resourceTypeParent
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+	$location = Get-Location "Microsoft.Sql" "servers" "West US"
 	$apiversion = "2014-04-01"
 
 	# Test
@@ -140,7 +138,7 @@ function Test-GetResourcesFromEmptyGroup
 {
 	# Setup
 	$rgname = Get-ResourceGroupName
-	$location = Get-ProviderLocation ResourceManagement
+	$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 
 	# Test
 	New-AzureRmResourceGroup -Name $rgname -Location $location
@@ -187,7 +185,7 @@ function Test-GetResourceForNonExisingResource
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceGroupName
-	$location = Get-ProviderLocation ResourceManagement
+	$location = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$resourceTypeWeb = "Microsoft.Web/sites"
 	$resourceTypeSql = "Microsoft.Sql/servers"
 	$apiversion = "2014-04-01"
@@ -211,10 +209,9 @@ function Test-GetResourcesViaPipingFromAnotherResource
 	$rgname = Get-ResourceGroupName
 	$rnameParent = Get-ResourceName
 	$rnameChild = Get-ResourceName
-	$resourceTypeParent = "Microsoft.Sql/servers"
 	$resourceTypeChild = "Microsoft.Sql/servers/databases"
-	$rglocation = Get-ProviderLocation ResourceManagement
-	$location = Get-ProviderLocation $resourceTypeParent
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+	$location = Get-Location "Microsoft.Sql" "servers" "West US"
 	$apiversion = "2014-04-01"
 
 	# Test
@@ -241,7 +238,7 @@ function Test-MoveAResource
 	$rgname = Get-ResourceGroupName
 	$rgname2 = Get-ResourceGroupName + "test3"
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -295,7 +292,7 @@ function Test-SetAResource
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -337,7 +334,7 @@ function Test-SetAResourceWithPatch
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -366,7 +363,7 @@ function Test-FindAResource
 	$rgname = Get-ResourceGroupName
 	$rname = "testname"
 	$rname2 = "test2name"
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -409,7 +406,7 @@ function Test-FindAResource-ByTag
 	$rgname = Get-ResourceGroupName
 	$rname = "testname"
 	$rname2 = "test2name"
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -451,7 +448,7 @@ function Test-GetResourceExpandProperties
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -504,7 +501,7 @@ function Test-ManageResourceWithZones
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = Get-ResourceName
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$location = "Central US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
@@ -551,7 +548,7 @@ function Test-RemoveAResource
 	# Setup
 	$rgname = Get-ResourceGroupName
 	$rname = "testname"
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"
 
@@ -580,7 +577,7 @@ function Test-RemoveASetOfResources
 	$rgname = Get-ResourceGroupName
 	$rname = "testname"
 	$rname2 = "test2name"
-	$rglocation = Get-ProviderLocation ResourceManagement
+	$rglocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
 	$apiversion = "2014-04-01"
 	$resourceType = "Providers.Test/statefulResources"