acr: remove util methods for deprecated classic sku (#18822)

Azure · Feb 18, 2021 · 5717ba1 · 5717ba1
1 parent c6531e7
commit 5717ba1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 86 deletions.
diff --git a/...rosoft.Azure.Management.ContainerRegistry/tests/Helpers/ContainerRegistryTestUtilities.cs b/...rosoft.Azure.Management.ContainerRegistry/tests/Helpers/ContainerRegistryTestUtilities.cs
@@ -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;
@@ -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;
@@ -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(

diff --git a/...agement.ContainerRegistry/tests/Microsoft.Azure.Management.ContainerRegistry.Tests.csproj b/...agement.ContainerRegistry/tests/Microsoft.Azure.Management.ContainerRegistry.Tests.csproj
@@ -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>
 

diff --git a/...gistry/Microsoft.Azure.Management.ContainerRegistry/tests/Tests/ContainerRegistryTests.cs b/...gistry/Microsoft.Azure.Management.ContainerRegistry/tests/Tests/ContainerRegistryTests.cs
@@ -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;
@@ -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);
@@ -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);