Skip to content

Commit b572763

Browse files
unknownunknown
unknown
authored and
unknown
committed
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr into crp2
Conflicts: src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
2 parents ac35cd6 + 638cca1 commit b572763

File tree

38 files changed

+6742
-768
lines changed

38 files changed

+6742
-768
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<Compile Include="ScenarioTests\VirtualMachineExtensionTests.cs" />
154154
<Compile Include="ScenarioTests\VirtualMachineNetworkInterfaceTests.cs" />
155155
<Compile Include="ScenarioTests\TestVirtualMachineSizeAndUsage.cs" />
156+
<Compile Include="ScenarioTests\VirtualMachinePIRv2Tests.cs" />
156157
<Compile Include="ScenarioTests\VirtualMachineTests.cs" />
157158
<Compile Include="Properties\Resources.Designer.cs">
158159
<AutoGen>True</AutoGen>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ Gets default RDFE Image
148148
#>
149149
function Get-DefaultCRPImage
150150
{
151-
param([string] $loca = "eastasia", [string] $query = '*Microsoft*Windows*Server')
151+
param([string] $loc = "eastasia", [string] $query = '*Microsoft*Windows*Server')
152152

153-
$result = (Get-AzureVMImagePublisher -Location $loc).Resources | select -ExpandProperty Name | where { $_ -like $query };
153+
$result = (Get-AzureVMImagePublisher -Location $loc) | select -ExpandProperty PublisherName | where { $_ -like $query };
154154
if ($result.Count -eq 1)
155155
{
156156
$defaultPublisher = $result;
@@ -160,7 +160,7 @@ function Get-DefaultCRPImage
160160
$defaultPublisher = $result[0];
161161
}
162162

163-
$result = (Get-AzureVMImageOffer -Location $loc -PublisherName $defaultPublisher).Resources | select -ExpandProperty Name | where { $_ -like '*Windows*' };
163+
$result = (Get-AzureVMImageOffer -Location $loc -PublisherName $defaultPublisher) | select -ExpandProperty Offer | where { $_ -like '*Windows*' };
164164
if ($result.Count -eq 1)
165165
{
166166
$defaultOffer = $result;
@@ -170,7 +170,7 @@ function Get-DefaultCRPImage
170170
$defaultOffer = $result[0];
171171
}
172172

173-
$result = (Get-AzureVMImageSku -Location $loc -PublisherName $defaultPublisher -Offer $defaultOffer).Resources | select -ExpandProperty Name;
173+
$result = (Get-AzureVMImageSku -Location $loc -PublisherName $defaultPublisher -Offer $defaultOffer) | select -ExpandProperty Skus;
174174
if ($result.Count -eq 1)
175175
{
176176
$defaultSku = $result;
@@ -180,7 +180,7 @@ function Get-DefaultCRPImage
180180
$defaultSku = $result[0];
181181
}
182182

183-
$result = (Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku).Resources | select -ExpandProperty Name;
183+
$result = (Get-AzureVMImageVersion -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku) | select -ExpandProperty Version;
184184
if ($result.Count -eq 1)
185185
{
186186
$defaultVersion = $result;
@@ -190,7 +190,7 @@ function Get-DefaultCRPImage
190190
$defaultVersion = $result[0];
191191
}
192192

193-
$vmimg = (Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion).VirtualMachineImage;
193+
$vmimg = Get-AzureVMImage -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion;
194194

195195
return $vmimg;
196196
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ function Test-VirtualMachineExtension
6464
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
6565
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
6666

67-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
67+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
6868

69-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
70-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
71-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
69+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
70+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
71+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
7272
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
7373

7474
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
@@ -242,11 +242,11 @@ function Test-VirtualMachineCustomScriptExtension
242242
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
243243
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
244244

245-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
245+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
246246

247-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
248-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
249-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
247+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
248+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
249+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
250250
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
251251

252252
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
@@ -399,11 +399,11 @@ function Test-VirtualMachineAccessExtension
399399
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
400400
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
401401

402-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
402+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
403403

404-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
405-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
406-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
404+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
405+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
406+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
407407
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
408408

409409
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ function Test-SingleNetworkInterface
6363
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
6464
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
6565

66-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
66+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
6767

68-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
69-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
70-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
68+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
69+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
70+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
7171
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
7272

7373
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;
@@ -182,11 +182,11 @@ function Test-SingleNetworkInterfaceDnsSettings
182182
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
183183
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
184184

185-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
185+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
186186

187-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
188-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
189-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
187+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
188+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
189+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
190190
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
191191

192192
# OS & Image
@@ -280,11 +280,11 @@ function Test-MultipleNetworkInterface
280280
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
281281
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
282282

283-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
283+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
284284

285-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
286-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
287-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
285+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
286+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
287+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
288288
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
289289

290290
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachinePIRv2Tests.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16+
using Xunit;
17+
18+
namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
19+
{
20+
public partial class VirtualMachineTests
21+
{
22+
//[Fact(Skip = "TODO: Record")]
23+
//[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestVirtualMachinePIRv2()
25+
{
26+
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachinePIRv2");
27+
}
28+
}
29+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ function Test-VirtualMachineProfile
4646
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
4747
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
4848

49-
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
49+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption Empty;
5050

51-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
52-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
53-
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
51+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1 -CreateOption Empty;
52+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2 -CreateOption Empty;
53+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3 -CreateOption Empty;
5454
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
5555

5656
Assert-AreEqual $p.StorageProfile.OSDisk.Caching $osDiskCaching;

0 commit comments

Comments
 (0)