Skip to content

Commit f59fe9c

Browse files
ogailogail
committed
Merge pull request #464 from huangpf/dev
AzureRT - Add Write-Output to Tests
2 parents 5d5b475 + 1073910 commit f59fe9c

File tree

6 files changed

+2434
-1964
lines changed

6 files changed

+2434
-1964
lines changed

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

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ function get_vm_config_object
2222
{
2323
param ([string] $rgname, [string] $vmsize)
2424

25+
$st = Write-Verbose "Creating VM Config Object - Start";
26+
2527
$vmname = 'vm' + $rgname;
2628
$p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
2729

30+
$st = Write-Verbose "Creating VM Config Object - End";
31+
2832
return $p;
2933
}
3034

@@ -33,11 +37,17 @@ function get_created_storage_account_name
3337
{
3438
param ([string] $loc, [string] $rgname)
3539

40+
$st = Write-Verbose "Creating and getting storage account for '${loc}' and '${rgname}' - Start";
41+
3642
$stoname = 'sto' + $rgname;
3743
$stotype = 'Standard_GRS';
3844

45+
$st = Write-Verbose "Creating and getting storage account for '${loc}' and '${rgname}' - '${stotype}' & '${stoname}'";
46+
3947
$st = New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
4048
$st = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
49+
50+
$st = Write-Verbose "Creating and getting storage account for '${loc}' and '${rgname}' - End";
4151

4252
return $stoname;
4353
}
@@ -47,14 +57,17 @@ function create_and_setup_nic_ids
4757
{
4858
param ([string] $loc, [string] $rgname, $vmconfig)
4959

60+
$st = Write-Verbose "Creating and getting NICs for '${loc}' and '${rgname}' - Start";
61+
5062
$subnet = New-AzureVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
5163
$vnet = New-AzureVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -DnsServer "10.1.1.1" -Subnet $subnet;
5264
$vnet = Get-AzureVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
5365
$subnetId = $vnet.Subnets[0].Id;
5466
$nic_ids = @($null) * 1;
5567
$nic0 = New-AzureNetworkInterface -Force -Name ('nic0' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId;
5668
$nic_ids[0] = $nic0.Id;
57-
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id -Primary;
69+
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id;
70+
$st = Write-Verbose "Creating and getting NICs for '${loc}' and '${rgname}' - End";
5871

5972
return $nic_ids;
6073
}
@@ -63,6 +76,8 @@ function create_and_setup_vm_config_object
6376
{
6477
param ([string] $loc, [string] $rgname, [string] $vmsize)
6578

79+
$st = Write-Verbose "Creating and setting up the VM config object for '${loc}', '${rgname}' and '${vmsize}' - Start";
80+
6681
$vmconfig = get_vm_config_object $rgname $vmsize
6782

6883
$user = "Foo12";
@@ -72,6 +87,8 @@ function create_and_setup_vm_config_object
7287
$computerName = "cn" + $rgname;
7388
$vmconfig = Set-AzureVMOperatingSystem -VM $vmconfig -Windows -ComputerName $computerName -Credential $cred;
7489

90+
$st = Write-Verbose "Creating and setting up the VM config object for '${loc}', '${rgname}' and '${vmsize}' - End";
91+
7592
return $vmconfig;
7693
}
7794

@@ -80,6 +97,8 @@ function setup_image_and_disks
8097
{
8198
param ([string] $loc, [string] $rgname, [string] $stoname, $vmconfig)
8299

100+
$st = Write-Verbose "Setting up image and disks of VM config object jfor '${loc}', '${rgname}' and '${stoname}' - Start";
101+
83102
$osDiskName = 'osDisk';
84103
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
85104
$osDiskCaching = 'ReadWrite';
@@ -88,26 +107,31 @@ function setup_image_and_disks
88107

89108
# Image Reference;
90109
$vmconfig.StorageProfile.SourceImage = $null;
91-
$imgRef = Get-DefaultCRPImage;
110+
$imgRef = Get-DefaultCRPImage -loc $loc;
92111
$vmconfig = ($imgRef | Set-AzureVMSourceImage -VM $vmconfig);
93112

94-
# TODO: Remove Data Disks for now
113+
# Do not add any data disks
95114
$vmconfig.StorageProfile.DataDisks = $null;
96115

116+
$st = Write-Verbose "Setting up image and disks of VM config object jfor '${loc}', '${rgname}' and '${stoname}' - End";
117+
97118
return $vmconfig;
98119
}
99120

100121

101-
function ps_vm_dynamic_test_func_1_pstestrg1166
122+
function ps_vm_dynamic_test_func_1_pstestrg1016
102123
{
103124
# Setup
104-
$rgname = 'pstestrg1166';
125+
$rgname = 'pstestrg1016';
105126

106127
try
107128
{
108-
$loc = 'westeurope';
109-
$vmsize = 'Standard_A5';
129+
$loc = 'West US';
130+
$vmsize = 'Standard_A3';
110131

132+
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Start ${rgname}, ${loc} & ${vmsize}";
133+
134+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Creating Resource Group';
111135
$st = New-AzureResourceGroup -Location $loc -Name $rgname;
112136

113137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
@@ -122,14 +146,20 @@ function ps_vm_dynamic_test_func_1_pstestrg1166
122146
$st = setup_image_and_disks $loc $rgname $stoname $vmconfig;
123147

124148
# Virtual Machine
149+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Creating VM';
150+
125151
$vmname = 'vm' + $rgname;
126152
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
127153

128154
# Get VM
155+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Getting VM';
129156
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
130157

131158
# Remove
159+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - Removing VM';
132160
$st = Remove-AzureVM -Name $vmname -ResourceGroupName $rgname -Force;
161+
162+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_1_pstestrg1016 - End';
133163
}
134164
finally
135165
{

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

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ function get_vm_config_object
2222
{
2323
param ([string] $rgname, [string] $vmsize)
2424

25+
$st = Write-Verbose "Creating VM Config Object - Start";
26+
2527
$vmname = 'vm' + $rgname;
2628
$p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
2729

30+
$st = Write-Verbose "Creating VM Config Object - End";
31+
2832
return $p;
2933
}
3034

@@ -33,11 +37,17 @@ function get_created_storage_account_name
3337
{
3438
param ([string] $loc, [string] $rgname)
3539

40+
$st = Write-Verbose "Creating and getting storage account for '${loc}' and '${rgname}' - Start";
41+
3642
$stoname = 'sto' + $rgname;
3743
$stotype = 'Standard_GRS';
3844

45+
$st = Write-Verbose "Creating and getting storage account for '${loc}' and '${rgname}' - '${stotype}' & '${stoname}'";
46+
3947
$st = New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
4048
$st = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
49+
50+
$st = Write-Verbose "Creating and getting storage account for '${loc}' and '${rgname}' - End";
4151

4252
return $stoname;
4353
}
@@ -47,14 +57,17 @@ function create_and_setup_nic_ids
4757
{
4858
param ([string] $loc, [string] $rgname, $vmconfig)
4959

60+
$st = Write-Verbose "Creating and getting NICs for '${loc}' and '${rgname}' - Start";
61+
5062
$subnet = New-AzureVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
5163
$vnet = New-AzureVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -DnsServer "10.1.1.1" -Subnet $subnet;
5264
$vnet = Get-AzureVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
5365
$subnetId = $vnet.Subnets[0].Id;
5466
$nic_ids = @($null) * 1;
5567
$nic0 = New-AzureNetworkInterface -Force -Name ('nic0' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId;
5668
$nic_ids[0] = $nic0.Id;
57-
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id -Primary;
69+
$vmconfig = Add-AzureVMNetworkInterface -VM $vmconfig -Id $nic0.Id;
70+
$st = Write-Verbose "Creating and getting NICs for '${loc}' and '${rgname}' - End";
5871

5972
return $nic_ids;
6073
}
@@ -63,6 +76,8 @@ function create_and_setup_vm_config_object
6376
{
6477
param ([string] $loc, [string] $rgname, [string] $vmsize)
6578

79+
$st = Write-Verbose "Creating and setting up the VM config object for '${loc}', '${rgname}' and '${vmsize}' - Start";
80+
6681
$vmconfig = get_vm_config_object $rgname $vmsize
6782

6883
$user = "Foo12";
@@ -72,6 +87,8 @@ function create_and_setup_vm_config_object
7287
$computerName = "cn" + $rgname;
7388
$vmconfig = Set-AzureVMOperatingSystem -VM $vmconfig -Windows -ComputerName $computerName -Credential $cred;
7489

90+
$st = Write-Verbose "Creating and setting up the VM config object for '${loc}', '${rgname}' and '${vmsize}' - End";
91+
7592
return $vmconfig;
7693
}
7794

@@ -80,6 +97,8 @@ function setup_image_and_disks
8097
{
8198
param ([string] $loc, [string] $rgname, [string] $stoname, $vmconfig)
8299

100+
$st = Write-Verbose "Setting up image and disks of VM config object jfor '${loc}', '${rgname}' and '${stoname}' - Start";
101+
83102
$osDiskName = 'osDisk';
84103
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
85104
$osDiskCaching = 'ReadWrite';
@@ -88,26 +107,31 @@ function setup_image_and_disks
88107

89108
# Image Reference;
90109
$vmconfig.StorageProfile.SourceImage = $null;
91-
$imgRef = Get-DefaultCRPImage;
110+
$imgRef = Get-DefaultCRPImage -loc $loc;
92111
$vmconfig = ($imgRef | Set-AzureVMSourceImage -VM $vmconfig);
93112

94-
# TODO: Remove Data Disks for now
113+
# Do not add any data disks
95114
$vmconfig.StorageProfile.DataDisks = $null;
96115

116+
$st = Write-Verbose "Setting up image and disks of VM config object jfor '${loc}', '${rgname}' and '${stoname}' - End";
117+
97118
return $vmconfig;
98119
}
99120

100121

101-
function ps_vm_dynamic_test_func_2_pstestrg7266
122+
function ps_vm_dynamic_test_func_2_pstestrg4940
102123
{
103124
# Setup
104-
$rgname = 'pstestrg7266';
125+
$rgname = 'pstestrg4940';
105126

106127
try
107128
{
108-
$loc = 'eastasia';
109-
$vmsize = 'Standard_A5';
129+
$loc = 'West Europe';
130+
$vmsize = 'Standard_A3';
110131

132+
$st = Write-Verbose "Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Start ${rgname}, ${loc} & ${vmsize}";
133+
134+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Creating Resource Group';
111135
$st = New-AzureResourceGroup -Location $loc -Name $rgname;
112136

113137
$vmconfig = create_and_setup_vm_config_object $loc $rgname $vmsize;
@@ -122,14 +146,20 @@ function ps_vm_dynamic_test_func_2_pstestrg7266
122146
$st = setup_image_and_disks $loc $rgname $stoname $vmconfig;
123147

124148
# Virtual Machine
149+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Creating VM';
150+
125151
$vmname = 'vm' + $rgname;
126152
$st = New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $vmconfig;
127153

128154
# Get VM
155+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Getting VM';
129156
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
130157

131158
# Remove
159+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - Removing VM';
132160
$st = Remove-AzureVM -Name $vmname -ResourceGroupName $rgname -Force;
161+
162+
$st = Write-Verbose 'Running Test ps_vm_dynamic_test_func_2_pstestrg4940 - End';
133163
}
134164
finally
135165
{

0 commit comments

Comments
 (0)