Skip to content

Commit 443f614

Browse files
huangpfhuangpf
committed
Update Tests
1 parent 3b09e1f commit 443f614

File tree

6 files changed

+1809
-1997
lines changed

6 files changed

+1809
-1997
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@ function Get-ComputeTestMode
8888
return $testMode;
8989
}
9090

91+
92+
<#
93+
.SYNOPSIS
94+
Get Compute Test Location
95+
#>
96+
function Get-ComputTestLocation
97+
{
98+
return $env:AZURE_COMPUTE_TEST_LOCATION;
99+
}
100+
101+
91102
######################
92103
#
93104
# Retry the given code block until it succeeds or times out.

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest1.ps1‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function create_and_setup_nic_ids
6666
$nic_ids = @($null) * 1;
6767
$nic0 = New-AzureNetworkInterface -Force -Name ('nic0' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId;
6868
$nic_ids[0] = $nic0.Id;
69-
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id;
69+
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id -Primary;
7070
$st = Write-Verbose "Creating and getting NICs for '${loc}' and '${rgname}' - End";
7171

7272
return $nic_ids;
@@ -119,19 +119,19 @@ function setup_image_and_disks
119119
}
120120

121121

122-
function ps_vm_dynamic_test_func_1_pstestrg1016
122+
function ps_vm_dynamic_test_func_1_pstestrg592
123123
{
124124
# Setup
125-
$rgname = 'pstestrg1016';
125+
$rgname = 'pstestrg592';
126126

127127
try
128128
{
129-
$loc = 'West US';
130-
$vmsize = 'Standard_A3';
129+
$loc = 'Japan East';
130+
$vmsize = 'Standard_A2';
131131

132-
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Start ${rgname}, ${loc} & ${vmsize}";
132+
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_1_pstestrg592 - Start ${rgname}, ${loc} & ${vmsize}";
133133

134-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Creating Resource Group';
134+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg592 - Creating Resource Group';
135135
$st = New-AzureResourceGroup -Location $loc -Name $rgname -Force;
136136

137137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
@@ -146,20 +146,20 @@ function ps_vm_dynamic_test_func_1_pstestrg1016
146146
$st = setup_image_and_disks $loc $rgname $stoname $vmconfig;
147147

148148
# Virtual Machine
149-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Creating VM';
149+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg592 - Creating VM';
150150

151151
$vmname = 'vm' + $rgname;
152152
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
153153

154154
# Get VM
155-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Getting VM';
155+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg592 - Getting VM';
156156
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
157157

158158
# Remove
159-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Removing VM';
159+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg592 - Removing VM';
160160
$st = Remove-AzureVM -Name $vmname -ResourceGroupName $rgname -Force;
161161

162-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - End';
162+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg592 - End';
163163
}
164164
finally
165165
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest2.ps1‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function create_and_setup_nic_ids
6666
$nic_ids = @($null) * 1;
6767
$nic0 = New-AzureNetworkInterface -Force -Name ('nic0' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId;
6868
$nic_ids[0] = $nic0.Id;
69-
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id;
69+
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id -Primary;
7070
$st = Write-Verbose "Creating and getting NICs for '${loc}' and '${rgname}' - End";
7171

7272
return $nic_ids;
@@ -119,19 +119,19 @@ function setup_image_and_disks
119119
}
120120

121121

122-
function ps_vm_dynamic_test_func_2_pstestrg4940
122+
function ps_vm_dynamic_test_func_2_pstestrg2115
123123
{
124124
# Setup
125-
$rgname = 'pstestrg4940';
125+
$rgname = 'pstestrg2115';
126126

127127
try
128128
{
129-
$loc = 'West Europe';
129+
$loc = 'East Asia';
130130
$vmsize = 'Standard_A3';
131131

132-
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Start ${rgname}, ${loc} & ${vmsize}";
132+
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - Start ${rgname}, ${loc} & ${vmsize}";
133133

134-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Creating Resource Group';
134+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - Creating Resource Group';
135135
$st = New-AzureResourceGroup -Location $loc -Name $rgname -Force;
136136

137137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
@@ -146,20 +146,20 @@ function ps_vm_dynamic_test_func_2_pstestrg4940
146146
$st = setup_image_and_disks $loc $rgname $stoname $vmconfig;
147147

148148
# Virtual Machine
149-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Creating VM';
149+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - Creating VM';
150150

151151
$vmname = 'vm' + $rgname;
152152
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
153153

154154
# Get VM
155-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Getting VM';
155+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - Getting VM';
156156
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
157157

158158
# Remove
159-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Removing VM';
159+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - Removing VM';
160160
$st = Remove-AzureVM -Name $vmname -ResourceGroupName $rgname -Force;
161161

162-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - End';
162+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg2115 - End';
163163
}
164164
finally
165165
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/Generated/VirtualMachineDynamicTest3.ps1‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function create_and_setup_nic_ids
6666
$nic_ids = @($null) * 1;
6767
$nic0 = New-AzureNetworkInterface -Force -Name ('nic0' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId;
6868
$nic_ids[0] = $nic0.Id;
69-
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id;
69+
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id -Primary;
7070
$st = Write-Verbose "Creating and getting NICs for '${loc}' and '${rgname}' - End";
7171

7272
return $nic_ids;
@@ -119,19 +119,19 @@ function setup_image_and_disks
119119
}
120120

121121

122-
function ps_vm_dynamic_test_func_3_pstestrg575
122+
function ps_vm_dynamic_test_func_3_pstestrg4410
123123
{
124124
# Setup
125-
$rgname = 'pstestrg575';
125+
$rgname = 'pstestrg4410';
126126

127127
try
128128
{
129-
$loc = 'Southeast Asia';
130-
$vmsize = 'Standard_A3';
129+
$loc = 'Central US';
130+
$vmsize = 'Standard_A1';
131131

132-
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_3_pstestrg575 - Start ${rgname}, ${loc} & ${vmsize}";
132+
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - Start ${rgname}, ${loc} & ${vmsize}";
133133

134-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg575 - Creating Resource Group';
134+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - Creating Resource Group';
135135
$st = New-AzureResourceGroup -Location $loc -Name $rgname -Force;
136136

137137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
@@ -146,20 +146,20 @@ function ps_vm_dynamic_test_func_3_pstestrg575
146146
$st = setup_image_and_disks $loc $rgname $stoname $vmconfig;
147147

148148
# Virtual Machine
149-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg575 - Creating VM';
149+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - Creating VM';
150150

151151
$vmname = 'vm' + $rgname;
152152
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
153153

154154
# Get VM
155-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg575 - Getting VM';
155+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - Getting VM';
156156
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
157157

158158
# Remove
159-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg575 - Removing VM';
159+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - Removing VM';
160160
$st = Remove-AzureVM -Name $vmname -ResourceGroupName $rgname -Force;
161161

162-
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg575 - End';
162+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_3_pstestrg4410 - End';
163163
}
164164
finally
165165
{

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VMDynamicTests.ps1‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ function Run-VMDynamicTests
259259
{
260260
param ([int] $num_total_generated_tests = 3, [string] $base_folder = '.\ScenarioTests\Generated')
261261

262+
$target_location = Get-ComputTestLocation;
263+
262264
$st = Write-Verbose 'Running VM Dynamic Tests - Start';
263265

264266
[bool] $isRecordMode = $true;
@@ -276,6 +278,8 @@ function Run-VMDynamicTests
276278

277279
$random_sstr = Get-ComputeTestResourceName;
278280
$random_seed = get_hash_int_value $random_sstr;
281+
282+
$random_vmsize_seeds = @($null) * $num_total_generated_tests;
279283

280284
for ($i = 0; $i -lt $num_total_generated_tests; $i++)
281285
{
@@ -289,6 +293,8 @@ function Run-VMDynamicTests
289293
$generated_func_name = 'ps_vm_dynamic_test_func_' + $index + '_' + $rgname_str;
290294
$generated_func_names[$i] = $generated_func_name;
291295

296+
$random_vmsize_seeds[$i] = get_hash_int_value (Get-ComputeTestResourceName);
297+
292298
$st = Write-Verbose "Running VM Dynamic Tests - File & Test Name #${index}: ${generated_file_name} & ${generated_func_name}";
293299
}
294300

@@ -313,7 +319,14 @@ function Run-VMDynamicTests
313319
$st = $func_create_and_setup_vm_config_object | Out-File -Encoding ASCII -Append -FilePath $generated_file_name -Force;
314320

315321
$loc_name_str = $locations[$i % $locations.Count];
316-
$vm_size_str = (get_all_standard_vm_sizes $loc_name_str) | Get-Random -SetSeed $random_seed;
322+
323+
if ($target_location -ne $null -and $target_location -ne '')
324+
{
325+
# Use Input Target Location String, if any
326+
$loc_name_str = $target_location;
327+
}
328+
329+
$vm_size_str = (get_all_standard_vm_sizes $loc_name_str) | Get-Random -SetSeed $random_vmsize_seeds[$i];
317330

318331
$st = $func_setup_image_and_disks | Out-File -Encoding ASCII -Append -FilePath $generated_file_name -Force;
319332

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VMDynamicTests/RunVMDynamicTests.json‎

Lines changed: 1752 additions & 1964 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)