Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/SDKs/Compute/AzSdk.RP.props
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_2017-12-01;Compute_2018-04-01;Compute_2017-09-01;ContainerService_2017-01-31;</AzureApiTag>
<AzureApiTag>Compute_2018-04-01;Compute_2017-09-01;ContainerService_2017-01-31;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion src/SDKs/Compute/Compute-HttpRequestNotFound.playlist

This file was deleted.

1 change: 0 additions & 1 deletion src/SDKs/Compute/Compute-PassedAfterRecording.playlist

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion src/SDKs/Compute/Compute-ReRecordAfterCRUpdate.playlist

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.

using System;
using Microsoft.Azure.Management.Compute;
using Microsoft.Azure.Management.Compute.Models;
using Microsoft.Azure.Management.ResourceManager;
Expand All @@ -22,18 +23,20 @@ public class ContainerServiceOperationalTests : ContainerServiceTestsBase
[Fact]
public void TestDCOSOperations()
{
string originalTestLocation = Environment.GetEnvironmentVariable("AZURE_VM_TEST_LOCATION");

using (MockContext context = MockContext.Start(this.GetType().FullName))
{
EnsureClientsInitialized(context);
m_location = "australiasoutheast"; // TODO: For now, APIs nly work in this region under BU endpoint

// Create resource group
var rgName = TestUtilities.GenerateName(TestPrefix) + 1;
var csName = TestUtilities.GenerateName(ContainerServiceNamePrefix);
var masterDnsPrefixName = TestUtilities.GenerateName(MasterProfileDnsPrefix);
var agentPoolDnsPrefixName = TestUtilities.GenerateName(AgentPoolProfileDnsPrefix);
try
{
Environment.SetEnvironmentVariable("AZURE_VM_TEST_LOCATION", "australiasoutheast");
EnsureClientsInitialized(context);

ContainerService inputContainerService;
var containerService = CreateContainerService_NoAsyncTracking(
rgName,
Expand All @@ -46,6 +49,7 @@ public void TestDCOSOperations()
}
finally
{
Environment.SetEnvironmentVariable("AZURE_VM_TEST_LOCATION", originalTestLocation);
// Cleanup the created resources. But don't wait since it takes too long, and it's not the purpose
// of the test to cover deletion. CSM does persistent retrying over all RG resources.
m_ResourcesClient.ResourceGroups.Delete(rgName);
Expand All @@ -64,18 +68,19 @@ public void TestDCOSOperations()
[Fact]
public void TestSwarmOperations()
{
string originalTestLocation = Environment.GetEnvironmentVariable("AZURE_VM_TEST_LOCATION");
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
EnsureClientsInitialized(context);
m_location = "australiasoutheast"; // TODO: For now, APIs nly work in this region under BU endpoint

// Create resource group
var rgName = TestUtilities.GenerateName(TestPrefix) + 1;
var csName = TestUtilities.GenerateName(ContainerServiceNamePrefix);
var masterDnsPrefixName = TestUtilities.GenerateName(MasterProfileDnsPrefix);
var agentPoolDnsPrefixName = TestUtilities.GenerateName(AgentPoolProfileDnsPrefix);
try
{
Environment.SetEnvironmentVariable("AZURE_VM_TEST_LOCATION", "australiasoutheast");
EnsureClientsInitialized(context);

ContainerService inputContainerService;
var containerService = CreateContainerService_NoAsyncTracking(
rgName,
Expand All @@ -88,6 +93,7 @@ public void TestSwarmOperations()
}
finally
{
Environment.SetEnvironmentVariable("AZURE_VM_TEST_LOCATION", originalTestLocation);
// Cleanup the created resources. But don't wait since it takes too long, and it's not the purpose
// of the test to cover deletion. CSM does persistent retrying over all RG resources.
m_ResourcesClient.ResourceGroups.Delete(rgName);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.

using System;
using System.Linq;
using Microsoft.Azure.Management.Compute;
using Microsoft.Azure.Management.Compute.Models;
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
using System.Linq;
using Xunit;

namespace Compute.Tests
Expand All @@ -25,18 +26,19 @@ public class ContainerServiceUpdateTests : ContainerServiceTestsBase
[Fact]
public void TestContainerServiceUpdateOperations()
{
string originalTestLocation = Environment.GetEnvironmentVariable("AZURE_VM_TEST_LOCATION");
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
EnsureClientsInitialized(context);
m_location = "australiasoutheast"; // TODO: For now, APIs nly work in this region under BU endpoint

// Create resource group
var rgName = TestUtilities.GenerateName(TestPrefix);
var csName = TestUtilities.GenerateName(ContainerServiceNamePrefix);
var masterDnsPrefixName = TestUtilities.GenerateName(MasterProfileDnsPrefix);
var agentPoolDnsPrefixName = TestUtilities.GenerateName(AgentPoolProfileDnsPrefix);
try
{
Environment.SetEnvironmentVariable("AZURE_VM_TEST_LOCATION", "australiasoutheast");
EnsureClientsInitialized(context);

ContainerService inputContainerService;
var containerService = CreateContainerService_NoAsyncTracking(
rgName,
Expand Down Expand Up @@ -68,6 +70,7 @@ public void TestContainerServiceUpdateOperations()
}
finally
{
Environment.SetEnvironmentVariable("AZURE_VM_TEST_LOCATION", originalTestLocation);
//Cleanup the created resources. But don't wait since it takes too long, and it's not the purpose
//of the test to cover deletion. CSM does persistent retrying over all RG resources.
m_ResourcesClient.ResourceGroups.Delete(rgName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ public class DiskRPManagedByTests : DiskRPTestsBase
/// This test tests the new managedby feature that is replacing ownerid.
/// It creates a VM, then gets the disk from that VM to check for the vm name in the manageby field
/// </summary>
[Fact(Skip = "ReRecord due to CR change")]
[Trait("Failure", "Password policy")]
[Trait("Failure", "New Unable Match Http")]
[Fact]
public void DiskManagedByTest()
{
using (MockContext context = MockContext.Start(this.GetType().FullName))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,26 @@ namespace Compute.Tests.DiskRPTests
{
public class DiskRPScenarioTests : DiskRPTestsBase
{
[Fact(Skip = "ReRecord due to CR change")]
[Fact]
public void Disk_CRUD_EmptyDisk()
{
Disk_CRUD_Execute(DiskCreateOption.Empty, "Disk_CRUD_EmptyDisk", diskSizeGB: 5);
}

[Fact(Skip = "ReRecord due to CR change")]
[Fact]
public void Disk_CRUD_EmptyDisk_Zones()
{
string supportedZoneLocation = "eastus2";
Disk_CRUD_Execute(DiskCreateOption.Empty, "Disk_CRUD_EmptyDisk_Zones", diskSizeGB: 5, location: supportedZoneLocation, zones: new List<string> { "1" });
}

[Fact(Skip = "ReRecord due to CR change")]
[Trait("Failure", "Password policy")]
[Trait("Failure", "New Unable Match Http")]
[Fact]
public void Disk_CRUD_ImportDisk()
{
Disk_CRUD_Execute(DiskCreateOption.Import, "Disk_CRUD_ImportDisk", diskSizeGB: 150);
}

[Fact(Skip = "ReRecord due to CR change")]
[Fact]
public void Snapshot_CRUD_EmptyDisk()
{
Snapshot_CRUD_Execute(DiskCreateOption.Empty, "Snapshot_CRUD_EmptyDisk", diskSizeGB: 5);
Expand All @@ -42,14 +40,13 @@ public void Disk_List_EmptyDisk()
Disk_List_Execute(DiskCreateOption.Empty, "Disk_List_EmptyDisk", diskSizeGB: 5);
}

[Fact(Skip = "ReRecord due to CR change")]
[Trait("Failure", "Password policy")]
[Fact]
public void Disk_List_ImportDisk()
{
Disk_List_Execute(DiskCreateOption.Import, "Disk_List_ImportDisk", diskSizeGB: 150);
}

[Fact(Skip = "ReRecord due to CR change")]
[Fact]
public void Snapshot_List_EmptyDisk()
{
Snapshot_List_Execute(DiskCreateOption.Empty, "Snapshot_List_EmptyDisk", diskSizeGB: 5);
Expand Down
Loading