Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,19 @@ public void TestVirtualMachineImageListTopOrderExpand()
{
TestRunner.RunTestScript("Test-VirtualMachineImageListTopOrderExpand");
}

[Fact]
[Trait(Category.AcceptanceType, Category.LiveOnly)]
public void TestVirtualMachineBootDiagnostics()
{
TestRunner.RunTestScript("Test-VirtualMachineBootDiagnostics");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualMachineGetVMNameAcrossResourceGroups()
{
TestRunner.RunTestScript("Test-VirtualMachineGetVMNameAcrossResourceGroups");
}
}
}
64 changes: 55 additions & 9 deletions src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4374,7 +4374,7 @@ function Test-HostGroupPropertySetOnVirtualMachine

<#
.SYNOPSIS
Test Virtual Machine Size and Usage
Test Get-AzVMImage new parameters -OrderBy and -Top.
#>
function Test-VirtualMachineImageListTopOrderExpand
{
Expand Down Expand Up @@ -4414,7 +4414,7 @@ function Test-VirtualMachineImageListTopOrderExpand

<#
.SYNOPSIS
This test can only run in Record mode. SEveral lines need to be uncommented for it to test the cmdlet.
This test can only run in Record mode. Several lines need to be uncommented for it to test the cmdlet.
Downloads the managed boot diagnostics of a Windows machine to a local file path.
#>
function Test-VirtualMachineBootDiagnostics
Expand All @@ -4432,9 +4432,9 @@ function Test-VirtualMachineBootDiagnostics
$vmname = 'vm' + $rgname;
# Create the file path on your machine, then set this variable to it.
# $localPath = "C:\Users\adsandor\Documents\bootDiags"

$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize;

# NRP
$subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
$vnet = New-AzVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
Expand All @@ -4447,19 +4447,19 @@ function Test-VirtualMachineBootDiagnostics
$nic = New-AzNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id;
$nic = Get-AzNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
$nicId = $nic.Id;

$p = Add-AzVMNetworkInterface -VM $p -Id $nicId;

# OS & Image
$user = "Foo2";
$password = $PLACEHOLDER;
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
$computerName = 'test';

# Windows OS test case.
$p = Set-AzVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;

$imgRef = Get-DefaultCRPImage -loc $loc;
$p = ($imgRef | Set-AzVMSourceImage -VM $p);

Expand All @@ -4475,6 +4475,52 @@ function Test-VirtualMachineBootDiagnostics
{
# Cleanup
Clean-ResourceGroup $rgname
}
}
}

<#
.SYNOPSIS
Test the Get-AzVm cmdlet when using VMs with the
same name across multiple Resource Groups.
#>
function Test-VirtualMachineGetVMNameAcrossResourceGroups
{
# Setup
$loc = "eastus";
$rgname = Get-ComputeTestResourceName;
$rgname2 = Get-ComputeTestResourceName;

try
{
New-AzResourceGroup -Name $rgname -Location $loc -Force;
New-AzResourceGroup -Name $rgname2 -Location $loc -Force;

# VM Profile & Hardware
$vmsize = 'Standard_E2s_v3';
$vmname1 = 'v' + $rgname;
$vmname3 = 'v3' + $rgname;

# Creating a VM using simple parameter set
$username = "admin01"
$password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
$cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password

$domainNameLabel1 = "domain1" + $rgname;
$domainNameLabel2 = "domain2" + $rgname;
$domainNameLabel3 = "domain3" + $rgname;

$vm1 = New-AzVM -ResourceGroupName $rgname -Location $loc -Name $vmname1 -Credential $cred -Zone "2" -Size $vmsize -DomainNameLabel $domainNameLabel1;
$vm2 = New-AzVM -ResourceGroupName $rgname2 -Location $loc -Name $vmname1 -Credential $cred -Zone "2" -Size $vmsize -DomainNameLabel $domainNameLabel2;
$vm3 = New-AzVM -ResourceGroupName $rgname2 -Location $loc -Name $vmname3 -Credential $cred -Zone "2" -Size $vmsize -DomainNameLabel $domainNameLabel3;

$vms = Get-AzVm -Name $vmname1 -Status;

Assert-AreEqual 2 $vms.Count;
}
finally
{
# Cleanup
Clean-ResourceGroup $rgname;
Clean-ResourceGroup $rgname2;
}
}

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Compute/Compute/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

-->
## Upcoming Release
* Edited Get-AzVm to filter by `-Name` prior to checking for throttling due to too many resources.

## Version 4.6.0
* Added `-VmssId` parameter to `New-AzVm`
Expand Down
78 changes: 42 additions & 36 deletions src/Compute/Compute/VirtualMachine/Operation/GetAzureVMCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
using Microsoft.Azure.Management.Compute;
using Microsoft.Azure.Management.Compute.Models;
using Microsoft.Azure.Management.Internal.Resources;
using Microsoft.Rest.Azure;
using Microsoft.Azure.Management.Authorization.Version2015_07_01;

namespace Microsoft.Azure.Commands.Compute
{
Expand Down Expand Up @@ -117,7 +119,7 @@ public override void ExecuteCmdlet()
{
ReturnListVMObject(
this.VirtualMachineClient.ListAllWithHttpMessagesAsync().GetAwaiter().GetResult(),
this.VirtualMachineClient.ListAllNextWithHttpMessagesAsync);
this.VirtualMachineClient.ListAllNextWithHttpMessagesAsync);
}
else if (ShouldGetByName(ResourceGroupName, Name))
{
Expand Down Expand Up @@ -149,14 +151,51 @@ public override void ExecuteCmdlet()
});
}

private void ReturnListVMObject(AzureOperationResponse<IPage<VirtualMachine>> vmListResult,
Func<string, Dictionary<string, List<string>>, CancellationToken, Task<AzureOperationResponse<IPage<VirtualMachine>>>> listNextFunction)
{
var psResultListStatus = new List<PSVirtualMachineListStatus>();

while (vmListResult != null)
{
psResultListStatus = GetPowerstate(vmListResult, psResultListStatus);

if (!string.IsNullOrEmpty(vmListResult.Body.NextPageLink))
{
vmListResult = listNextFunction(vmListResult.Body.NextPageLink, null, default(CancellationToken)).GetAwaiter().GetResult();
}
else
{
vmListResult = null;
}
}

if (this.Status.IsPresent)
{
WriteObject(TopLevelWildcardFilter(ResourceGroupName, Name, psResultListStatus), true);
}
else
{
var psResultList = new List<PSVirtualMachineList>();
foreach (var item in psResultListStatus)
{
var psItem = ComputeAutoMapperProfile.Mapper.Map<PSVirtualMachineList>(item);
psResultList.Add(psItem);
}
WriteObject(TopLevelWildcardFilter(ResourceGroupName, Name, psResultList), true);
}
}

private List<PSVirtualMachineListStatus> GetPowerstate(
AzureOperationResponse<IPage<VirtualMachine>> vmListResult,
List<PSVirtualMachineListStatus> psResultListStatus)
{

if (vmListResult.Body != null)
{
int vm_count = 0;
foreach (var item in vmListResult.Body)
var filteredList = TopLevelWildcardFilter(ResourceGroupName, Name, resources: vmListResult.Body);
foreach (var item in filteredList)
{
vm_count++;
var psItem = ComputeAutoMapperProfile.Mapper.Map<PSVirtualMachineListStatus>(vmListResult);
Expand Down Expand Up @@ -206,39 +245,6 @@ private List<PSVirtualMachineListStatus> GetPowerstate(
return psResultListStatus;
}

private void ReturnListVMObject(AzureOperationResponse<IPage<VirtualMachine>> vmListResult,
Func<string, Dictionary<string, List<string>>, CancellationToken, Task<AzureOperationResponse<IPage<VirtualMachine>>>> listNextFunction)
{
var psResultListStatus = new List<PSVirtualMachineListStatus>();

while (vmListResult != null)
{
psResultListStatus = GetPowerstate(vmListResult, psResultListStatus);

if (!string.IsNullOrEmpty(vmListResult.Body.NextPageLink))
{
vmListResult = listNextFunction(vmListResult.Body.NextPageLink, null, default(CancellationToken)).GetAwaiter().GetResult();
}
else
{
vmListResult = null;
}
}

if (this.Status.IsPresent)
{
WriteObject(TopLevelWildcardFilter(ResourceGroupName, Name, psResultListStatus), true);
}
else
{
var psResultList = new List<PSVirtualMachineList>();
foreach (var item in psResultListStatus)
{
var psItem = ComputeAutoMapperProfile.Mapper.Map<PSVirtualMachineList>(item);
psResultList.Add(psItem);
}
WriteObject(TopLevelWildcardFilter(ResourceGroupName, Name, psResultList), true);
}
}

}
}