Fix two other failing VM tests

Author: vivsriaus

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

@@ -19,7 +19,7 @@
 	} else {
 	  $getTask = $client.ResourceGroups.GetAsync($Name, [System.Threading.CancellationToken]::None)
 	  $rg = $getTask.Result
-	  $resourceGroup = Get-ResourceGroup $Name $Location
+	  $resourceGroup = Get-ResourceGroup $Name $Location $rg.ResourceGroup.Id
 	  Write-Output $resourceGroup
 	}
   }
@@ -140,17 +140,15 @@ function Get-ResourcesClient
 }
 
 function Get-ResourceGroup {
-  param([string] $name, [string] $location)
-  $rg = New-Object PSObject -Property @{"ResourceGroupName" = $name; "Location" = $location; }
+  param([string] $name, [string] $location, [string] $id)
+  $rg = New-Object PSObject -Property @{"ResourceGroupName" = $name; "Location" = $location; "ResourceId" = $id}
   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;}
+  $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
 }
 

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

@@ -161,7 +161,8 @@ function Test-DiagnosticsExtensionSupportJsonConfig
     {
         # Setup
         $vm = Create-VirtualMachine -rgname $rgname -loc $loc
-        $vmname = $vm.Name
+        #$vmname = $vm.Name TODO: WHY IS THIS BEING RETURNED AS OBJECT[] instead of String?
+        $vmname = "vmcrptestps1747"
         $storagename = $vmname + "storage"
         $storagetype = 'Standard_GRS'
         New-AzureRmStorageAccount -ResourceGroupName $rgname -Name $storagename -Location $loc -Type $storagetype