Skip to content

Commit e9d54c5

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/Common/ConstantStringTypes.cs
2 parents 66f42da + ed22ddd commit e9d54c5

File tree

91 files changed

+19995
-4323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+19995
-4323
lines changed

‎ChangeLog.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* Get-AzureLoadBalancerBackendAddressPoolConfig
3333
* Get-AzureLoadBalancerFrontendIpConfig
3434
* Get-AzureLoadBalancerInboundNatRuleConfig
35-
* Get-AzureLoadBalancerProbeConfig*
35+
* Get-AzureLoadBalancerProbeConfig
3636
* Get-AzureLoadBalancerRuleConfig
3737
* New-AzureLoadBalancer
3838
* New-AzureLoadBalancerBackendAddressPoolConfig
@@ -60,6 +60,7 @@
6060
* Remove-AzureNetworkSecurityRuleConfig
6161
* Add-AzureNetworkSecurityRuleConfig
6262
* Set-AzureNetworkSecurityRuleConfig
63+
* Get-AzureRemoteDesktopFile
6364
* Azure Storage
6465
* Added cmdlets in AzureResourceManager Mode
6566
* New-AzureStorageAccount

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78-
<SpecificVersion>False</SpecificVersion>
79-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.3.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
78+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
79+
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="Microsoft.Azure.ResourceManager">
8282
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -148,6 +148,8 @@
148148
<Compile Include="ScenarioTests\StorageAccountTests.cs" />
149149
<Compile Include="ScenarioTests\TestVirtualMachineImageList.cs" />
150150
<Compile Include="ScenarioTests\TestVirtualMachineList.cs" />
151+
<Compile Include="ScenarioTests\VirtualMachineDataDiskTests.cs" />
152+
<Compile Include="ScenarioTests\VirtualMachineCaptureTests.cs" />
151153
<Compile Include="ScenarioTests\VirtualMachineProfileTests.cs" />
152154
<Compile Include="ScenarioTests\AvailabilitySetTests.cs" />
153155
<Compile Include="ScenarioTests\VirtualMachineExtensionTests.cs" />
@@ -271,12 +273,21 @@
271273
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineProfileTests\TestVirtualMachineProfile.json">
272274
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
273275
</None>
276+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineDataDisk.json">
277+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
278+
</None>
274279
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineImageList.json">
275280
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
276281
</None>
277282
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineList.json">
278283
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
279284
</None>
285+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineCapture.json">
286+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
287+
</None>
288+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachinePIRv2.json">
289+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
290+
</None>
280291
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests\TestVirtualMachineSizeAndUsage.json">
281292
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
282293
</None>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ function Get-DefaultCRPImage
180180
$defaultSku = $result[0];
181181
}
182182

183-
$result = (Get-AzureVMImageVersion -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku) | select -ExpandProperty Version;
183+
$result = (Get-AzureVMImage -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;
193+
$vmimg = Get-AzureVMImageDetail -Location $loc -Offer $defaultOffer -PublisherName $defaultPublisher -Skus $defaultSku -Version $defaultVersion;
194194

195195
return $vmimg;
196196
}

‎src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachineExtensionImageDetails.cs renamed to ‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineCaptureTests.cs

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,18 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Management.Compute.Models;
16-
using System;
17-
using System.Collections.Generic;
18-
using System.Linq;
15+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16+
using Xunit;
1917

20-
namespace Microsoft.Azure.Commands.Compute.Models
18+
namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
2119
{
22-
public class PSVirtualMachineExtensionImageDetails : PSVirtualMachineExtensionImage
20+
public partial class VirtualMachineTests
2321
{
24-
public string Name { get; set; }
25-
26-
public string HandlerSchema { get; set; }
27-
28-
public string OperatingSystem { get; set; }
29-
30-
public string ComputeRole { get; set; }
31-
32-
public bool SupportsMultipleExtensions { get; set; }
33-
34-
public bool VMScaleSetEnabled { get; set; }
22+
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestVirtualMachineCapture()
25+
{
26+
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineCapture");
27+
}
3528
}
3629
}

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineDataDiskTests.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]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestVirtualMachineDataDisk()
25+
{
26+
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineDataDisk");
27+
}
28+
}
29+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
1919
{
2020
public partial class VirtualMachineTests
2121
{
22-
//[Fact(Skip = "TODO: Record")]
23-
//[Trait(Category.AcceptanceType, Category.CheckIn)]
22+
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2424
public void TestVirtualMachinePIRv2()
2525
{
2626
ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachinePIRv2");

0 commit comments

Comments
 (0)