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 @@ -290,6 +290,9 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineDataDisk.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineDataDiskNegative.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineImageList.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function Test-AvailabilitySet
try
{
# Common
$loc = 'West US';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

$asetName = 'avs' + $rgname;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function Run-ComputeCloudExceptionTests
try
{
# Common
$loc = 'West US';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

$compare = "Resource*NotFound*OperationID : `'*`'";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,3 +394,75 @@ function Get-SasUri

return $uri;
}

# Get a Location according to resource provider.
function Get-ResourceProviderLocation
{
param ([string] $name, [string] $default = "westus", [bool] $canonical = $true)

$loc = Get-AzureLocation | where { $_.Name.Equals($name) };

if ($loc -eq $null)
{
throw 'There is no available locations with given parameters';
}

if ($loc.LocationsString.ToLowerInvariant().Replace(" ", "").Contains($default.ToLowerInvariant().Replace(" ","")))
{
return $default;
}

if ($canonical)
{
return $loc.Locations[0].ToLowerInvariant().Replace(" ", "");
}
else
{
return $loc.Locations[0];
}
}

function Get-ComputeVMLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines";
}

function Get-ComputeAvailabilitySetLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/availabilitySets";
}

function Get-ComputeVMExtensionLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/extensions";
}

function Get-ComputeVMDiagnosticSettingLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/diagnosticSettings";
}

function Get-ComputeVMMetricDefinitionLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/virtualMachines/metricDefinitions";
}

function Get-ComputeOperationLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/locations/operations";
}

function Get-ComputeVMSizeLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/locations/vmSizes";
}

function Get-ComputeUsageLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/locations/usages";
}

function Get-ComputePublisherLocation
{
Get-ResourceProviderLocation "Microsoft.Compute/locations/publishers";
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function Test-VirtualMachineExtension
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down Expand Up @@ -163,7 +163,7 @@ function Test-VirtualMachineExtensionUsingHashTable
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down Expand Up @@ -325,7 +325,7 @@ function Test-VirtualMachineCustomScriptExtension
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down Expand Up @@ -494,7 +494,7 @@ function Test-VirtualMachineCustomScriptExtensionFileUri
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down Expand Up @@ -652,7 +652,7 @@ function Test-VirtualMachineAccessExtension
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function Test-SingleNetworkInterface
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down Expand Up @@ -146,7 +146,7 @@ function Test-SingleNetworkInterfaceDnsSettings
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down Expand Up @@ -252,7 +252,7 @@ function Test-MultipleNetworkInterface
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down Expand Up @@ -366,7 +366,7 @@ function Test-AddNetworkInterface
try
{
# Common
$loc = 'westus';
$loc = Get-ComputeVMLocation;
New-AzureResourceGroup -Name $rgname -Location $loc -Force;

# VM Profile & Hardware
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ public void TestVirtualMachineDataDisk()
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineDataDisk");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualMachineDataDiskNegative()
{
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineDataDiskNegative");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualMachinePIRv2()
Expand Down
Loading