Skip to content

[AutoPR Microsoft.Azure.Management.Compute] add track2 config #1261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openapi-sdkautomation wants to merge 1 commit into from
Closed

[AutoPR Microsoft.Azure.Management.Compute] add track2 config #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sdk/compute/Microsoft.Azure.Management.Compute/AzSdk.RP.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>Compute_2019-12-01;Compute_2019-11-01;Compute_2019-04-01;ContainerService_2017-01-31;</AzureApiTag>
<AzureApiTag>Compute_2020-05-01;Compute_2019-12-01;Compute_2019-11-01;Compute_2019-04-01;ContainerService_2017-01-31;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions sdk/compute/Microsoft.Azure.Management.Compute/src/Microsoft.Azure.Management.Compute.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<PropertyGroup>
<PackageId>Microsoft.Azure.Management.Compute</PackageId>
<Description>Provides developers with libraries for the updated compute platform under Azure Resource manager to deploy virtual machine, virtual machine extensions and availability set management capabilities. Launch, restart, scale, capture and manage VMs, VM Extensions and more. Note: This client library is for Virtual Machines under Azure Resource Manager.</Description>
<Version>36.1.0.0</Version>
<Version>37.0.0.0</Version>
<AssemblyName>Microsoft.Azure.Management.Compute</AssemblyName>
<PackageTags>management;virtual machine;compute;</PackageTags>
<PackageReleaseNotes>
<![CDATA[
This is a public release of the Azure Compute SDK. Included with this release are the fixes for Gallery Image Version Update and VM Scale Set ConvertToSinglePlacementGroup API.
This is a public release of the Azure Compute SDK. Included with this release are the changes for DiskRP API Version 2020-05-01 which includes Managed Disk support for Private Links via DiskAccess resource.
]]>
</PackageReleaseNotes>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions sdk/compute/Microsoft.Azure.Management.Compute/src/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[assembly: AssemblyTitle("Microsoft Azure Compute Management Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Compute Resources.")]

[assembly: AssemblyVersion("36.0.0.0")]
[assembly: AssemblyFileVersion("36.1.0.0")]
[assembly: AssemblyVersion("37.0.0.0")]
[assembly: AssemblyFileVersion("37.0.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
Expand Down
6 changes: 3 additions & 3 deletions sdk/compute/Microsoft.Azure.Management.Compute/tests/DiskRPTests/DiskRPCreateOptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Compute.Tests.DiskRPTests
{
public class DiskRPCreateOptionTests : DiskRPTestsBase
{
private static string DiskRPLocation = "centralus";
private static string DiskRPLocation = "centraluseuap";

/// <summary>
/// positive test for testing upload disks
Expand Down Expand Up @@ -63,8 +63,8 @@ public void DiskFromGalleryImageVersion()
disk.Location = DiskRPLocation;
disk.CreationData.GalleryImageReference = new ImageDiskReference
{
Id = "/subscriptions/0296790d-427c-48ca-b204-8b729bbd8670/resourceGroups/swaggertests/providers/Microsoft.Compute/galleries/swaggergallery/images/lunexample2/versions/1.0.0",
Lun = 1
Id = "/subscriptions/0296790d-427c-48ca-b204-8b729bbd8670/resourceGroups/longrunningrg-centraluseuap/providers/Microsoft.Compute/galleries/swaggergallery/images/swaggerimage/versions/1.1.0",
Lun = 0
};
try
{
Expand Down
53 changes: 53 additions & 0 deletions sdk/compute/Microsoft.Azure.Management.Compute/tests/DiskRPTests/DiskRPDiskAccessTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Text;
using Compute.Tests.DiskRPTests;
using Microsoft.Azure.Management.Compute.Models;
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Azure.Management.ResourceManager.Models;
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
using Xunit;

namespace Compute.Tests.DiskRPTests
{
public class DiskRPDiskAccessTests : DiskRPTestsBase
{
private static string supportedZoneLocation = "centraluseuap";

[Fact]
public void DiskAccess_CRUD()
{
DiskAccess_CRUD_Execute("DiskAccess_CRUD", location: supportedZoneLocation);
}

[Fact(Skip = "TODO: Wait for Microsoft.Azure.Management.Network dll upgrade")]
public void DiskAccess_WithPrivateEndpoint_CRUD()
{
DiskAccess_WithPrivateEndpoint_CRUD_Execute("DiskAccess_WithPrivateEndpoint_CRUD", location: supportedZoneLocation);
}

[Fact]
public void DiskAccess_List()
{
DiskAccess_List_Execute("DiskAccess_List", location: supportedZoneLocation);
}

[Fact]
public void DiskAccess_CreateDisk()
{
DiskAccess_CreateDisk_Execute("DiskAccess_CreateDisk", location: supportedZoneLocation);
}

[Fact]
public void DiskAccess_AddDiskAccessToExistingDisk()
{
DiskAccess_UpdateDisk_Execute("DiskAccess_AddDiskAccessToExistingDisk", location: supportedZoneLocation);
}

[Fact]
public void DiskAccess_RemoveDiskAccessFromExistingDisk()
{
DiskAccess_UpdateDisk_RemoveDiskAccess_Execute("DiskAccess_RemoveDiskAccessFromExistingDisk", location: supportedZoneLocation);
}
}
}
8 changes: 7 additions & 1 deletion ...pute/Microsoft.Azure.Management.Compute/tests/DiskRPTests/DiskRPDiskEncryptionSetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ public class DiskRPDiskEncryptionSetTests : DiskRPTestsBase
[Fact]
public void DiskEncryptionSet_CRUD()
{
DiskEncryptionSet_CRUD_Execute("DiskEncryptionSet_CRUD", location: supportedZoneLocation);
DiskEncryptionSet_CRUD_Execute("DiskEncryptionSet_CRUD", EncryptionType.EncryptionAtRestWithCustomerKey, location: supportedZoneLocation);
}

[Fact]
public void DiskEncryptionSet_CRUD_EncryptionWithPlatformAndCustomerKeys()
{
DiskEncryptionSet_CRUD_Execute("DiskEncryptionSet_CRUD_EncryptionWithPlatformAndCustomerKeys", EncryptionType.EncryptionAtRestWithPlatformAndCustomerKeys, location: supportedZoneLocation);
}

[Fact]
Expand Down
8 changes: 4 additions & 4 deletions sdk/compute/Microsoft.Azure.Management.Compute/tests/DiskRPTests/DiskRPEncryptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Compute.Tests.DiskRPTests
{
public class DiskRPEncryptionTests : DiskRPTestsBase
{
private static string DiskRPLocation = "westcentralus";
private static string DiskRPLocation = "centraluseuap";

/// <summary>
/// positive test for testing disks encryption
Expand All @@ -30,9 +30,9 @@ public void DiskEncryptionPositiveTest()
using (MockContext context = MockContext.Start(this.GetType()))
{
EnsureClientsInitialized(context);
string testVaultId = @"/subscriptions/" + m_CrpClient.SubscriptionId + "/resourceGroups/24/providers/Microsoft.KeyVault/vaults/swaggervault2";
string encryptionKeyUri = @"https://swaggervault2.vault.azure.net/keys/swaggerkey/6108e4eb47c14bdf863f1465229f8e66";
string secretUri = @"https://swaggervault2.vault.azure.net/secrets/swaggersecret/c464e5083aab4f73968700e8b077c54d";
string testVaultId = @"/subscriptions/0296790d-427c-48ca-b204-8b729bbd8670/resourceGroups/longrunningrg-centraluseuap/providers/Microsoft.KeyVault/vaults/swaggerKeyVault5";
string encryptionKeyUri = @"https://swaggerkeyvault5.vault.azure.net/keys/swaggerKey/52317b056a2c49d0b8673a67d072655e";
string secretUri = @"https://swaggerkeyvault5.vault.azure.net/secrets/swaggerSecret/0e01a1ab339e40ff9f01ea98ae8ee6b5";
string encryptionSettingsVersion = "1.0";

var rgName = TestUtilities.GenerateName(TestPrefix);
Expand Down
Loading