Skip to content
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

Jump to bottom

acr: remove test artifacts for deprecated classic sku #18822

Merged
merged 1 commit into from
Feb 18, 2021
Merged

acr: remove test artifacts for deprecated classic sku #18822

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
45 changes: 0 additions & 45 deletions ...rosoft.Azure.Management.ContainerRegistry/tests/Helpers/ContainerRegistryTestUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
using Microsoft.Azure.Management.ContainerRegistry.Models;
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Azure.Management.ResourceManager.Models;
using Microsoft.Azure.Management.Storage;
using Microsoft.Azure.Management.Storage.Models;
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -62,13 +60,6 @@ public static ResourceManagementClient GetResourceManagementClient(MockContext c
return client;
}

public static StorageManagementClient GetStorageManagementClient(MockContext context, RecordedDelegatingHandler handler)
{
handler.IsPassThrough = true;
StorageManagementClient client = context.GetServiceClient<StorageManagementClient>(handlers: handler);
return client;
}

public static ContainerRegistryManagementClient GetContainerRegistryManagementClient(MockContext context, RecordedDelegatingHandler handler)
{
handler.IsPassThrough = true;
Expand All @@ -86,42 +77,6 @@ public static ResourceGroup CreateResourceGroup(ResourceManagementClient client)
});
}

public static StorageAccount CreateStorageAccount(StorageManagementClient client, ResourceGroup resourceGroup)
{
return client.StorageAccounts.Create(
resourceGroup.Name,
TestUtilities.GenerateName("acrstorage"),
new StorageAccountCreateParameters
{
Location = resourceGroup.Location,
Sku = new Microsoft.Azure.Management.Storage.Models.Sku
{
Name = Microsoft.Azure.Management.Storage.Models.SkuName.StandardLRS
},
Kind = Kind.Storage
});
}

public static Registry CreateClassicContainerRegistry(ContainerRegistryManagementClient client, ResourceGroup resourceGroup, StorageAccount storageAccount)
{
return client.Registries.Create(
resourceGroup.Name,
TestUtilities.GenerateName("acrregistry"),
new Registry
{
Location = resourceGroup.Location,
Sku = new Sku
{
Name = SkuName.Classic
},
StorageAccount = new StorageAccountProperties
{
Id = storageAccount.Id
},
Tags = DefaultTags
});
}

public static Registry CreateManagedContainerRegistry(ContainerRegistryManagementClient client, string resourceGroupName, string location)
{
return client.Registries.Create(
Expand Down
1 change: 0 additions & 1 deletion ...agement.ContainerRegistry/tests/Microsoft.Azure.Management.ContainerRegistry.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="[7.0.0-preview,7.0)" />
<ProjectReference Include="..\src\Microsoft.Azure.Management.ContainerRegistry.csproj" />
</ItemGroup>

Expand Down
49 changes: 9 additions & 40 deletions ...gistry/Microsoft.Azure.Management.ContainerRegistry/tests/Tests/ContainerRegistryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Microsoft.Azure.Management.ContainerRegistry.Models;
using Microsoft.Azure.Management.ResourceManager;
using Microsoft.Azure.Management.ResourceManager.Models;
using Microsoft.Azure.Management.Storage;
using Microsoft.Rest.Azure;
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
using System;
Expand Down Expand Up @@ -74,37 +73,22 @@ public void ManagedContainerRegistryTest()
// Create container registry
var registry = ContainerRegistryTestUtilities.CreateManagedContainerRegistry(registryClient, resourceGroup.Name, resourceGroup.Location);

ContainerRegistryCoreScenario(registryClient, resourceGroup, registry, true);
ContainerRegistryCoreScenario(registryClient, resourceGroup, registry);
}
}

private void ContainerRegistryCoreScenario(ContainerRegistryManagementClient registryClient, ResourceGroup resourceGroup, Registry registry, bool isManaged)
private void ContainerRegistryCoreScenario(ContainerRegistryManagementClient registryClient, ResourceGroup resourceGroup, Registry registry)
{
// Validate the created registry
ContainerRegistryTestUtilities.ValidateResourceDefaultTags(registry);
Assert.NotNull(registry.Sku);
if (isManaged)
{
Assert.Equal(SkuName.Premium, registry.Sku.Name);
Assert.Equal(SkuName.Premium, registry.Sku.Tier);
}
else
{
Assert.Equal(SkuName.Classic, registry.Sku.Name);
Assert.Equal(SkuTier.Classic, registry.Sku.Tier);
}
Assert.Equal(SkuName.Premium, registry.Sku.Name);
Assert.Equal(SkuName.Premium, registry.Sku.Tier);

Assert.NotNull(registry.LoginServer);
Assert.NotNull(registry.CreationDate);
Assert.Equal(ProvisioningState.Succeeded, registry.ProvisioningState);
Assert.False(registry.AdminUserEnabled);
if (isManaged)
{
Assert.Null(registry.StorageAccount);
}
else
{
Assert.NotNull(registry.StorageAccount);
}

// List container registries by resource group
var registriesByResourceGroup = registryClient.Registries.ListByResourceGroup(resourceGroup.Name);
Expand Down Expand Up @@ -136,35 +120,20 @@ private void ContainerRegistryCoreScenario(ContainerRegistryManagementClient reg
AdminUserEnabled = true,
Sku = new Sku
{
Name = isManaged ? SkuName.Basic : SkuName.Classic
Name = SkuName.Basic
}
});

// Validate the updated registry
ContainerRegistryTestUtilities.ValidateResourceDefaultNewTags(registry);
Assert.NotNull(registry.Sku);
if (isManaged)
{
Assert.Equal(SkuName.Basic, registry.Sku.Name);
Assert.Equal(SkuName.Basic, registry.Sku.Tier);
}
else
{
Assert.Equal(SkuName.Classic, registry.Sku.Name);
Assert.Equal(SkuTier.Classic, registry.Sku.Tier);
}
Assert.Equal(SkuName.Basic, registry.Sku.Name);
Assert.Equal(SkuName.Basic, registry.Sku.Tier);

Assert.NotNull(registry.LoginServer);
Assert.NotNull(registry.CreationDate);
Assert.Equal(ProvisioningState.Succeeded, registry.ProvisioningState);
Assert.True(registry.AdminUserEnabled);
if (isManaged)
{
Assert.Null(registry.StorageAccount);
}
else
{
Assert.NotNull(registry.StorageAccount);
}

// List credentials
var credentials = registryClient.Registries.ListCredentials(resourceGroup.Name, registry.Name);
Expand Down