Network mgmt track 2 library

common/ManagementTestShared/Current/ManagementRecordedTestBase.cs

@@ -30,6 +30,11 @@ protected ValueTask<Response<T>> WaitForCompletionAsync<T>(Operation<T> operatio
             return operation.WaitForCompletionAsync();
         }
 
+        protected ValueTask<Response> WaitForCompletionAsync(Operation operation)
+        {
+            return operation.WaitForCompletionResponseAsync();
+        }
+
         protected ResourcesManagementClient GetResourceManagementClient()
         {
             var options = InstrumentClientOptions(new ResourcesManagementClientOptions());

eng/Packages.Data.props

@@ -160,7 +160,7 @@
     <PackageReference Update="Azure.Messaging.EventHubs" Version="5.2.0" />
     <PackageReference Update="Azure.Messaging.EventGrid" Version="4.0.0" />
     <PackageReference Update="Azure.ResourceManager.Compute" Version="1.0.0-alpha.20210824.1" />
-    <PackageReference Update="Azure.ResourceManager.Network" Version="1.0.0-preview.2" />
+    <PackageReference Update="Azure.ResourceManager.Network" Version="1.0.0-alpha.20210827.3" />
     <PackageReference Update="Azure.ResourceManager.Resources" Version="1.0.0-preview.2" />
     <PackageReference Update="Azure.ResourceManager.Storage" Version="1.0.0-preview.2" />
     <PackageReference Update="Azure.Search.Documents" Version="11.2.0" />

sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/tests/AppConfigurationClientBase.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
+using Azure.Core;
 using Azure.Core.TestFramework;
-using Azure.ResourceManager.Network;
 using Azure.ResourceManager.Resources;
+using Azure.ResourceManager.Network;
 using Azure.ResourceManager.TestFramework;
 
 namespace Azure.ResourceManager.AppConfiguration.Tests
@@ -13,10 +13,12 @@ namespace Azure.ResourceManager.AppConfiguration.Tests
     public abstract class AppConfigurationClientBase : ManagementRecordedTestBase<AppConfigurationManagementTestEnvironment>
     {
         public AppConfigurationManagementClient AppConfigurationManagementClient { get; set; }
-        public ResourcesManagementClient ResourcesManagementClient { get; set; }
+        public ArmClient ArmClient { get; set; }
         public ConfigurationStoresOperations ConfigurationStoresOperations { get; set; }
         public PrivateEndpointConnectionsOperations PrivateEndpointConnectionsOperations { get; set; }
-        public ResourceGroupsOperations ResourceGroupsOperations { get; set; }
+        public ResourceGroupContainer ResourceGroupContainer { get; set; }
+        public VirtualNetworkContainer VirtualNetworkContainer { get; set; }
+        public PrivateEndpointContainer PrivateEndpointContainer { get; set; }
         public PrivateLinkResourcesOperations PrivateLinkResourcesOperations { get; set; }
         public Operations Operations { get; set; }
         public string AzureLocation { get; set; }
@@ -27,10 +29,6 @@ public abstract class AppConfigurationClientBase : ManagementRecordedTestBase<Ap
         public string TestContentType { get; set; }
         public string TestValue { get; set; }
         public string ResourceGroupPrefix { get; set; }
-        public NetworkManagementClient NetworkManagementClient { get; set; }
-        public VirtualNetworksOperations VirtualNetworksOperations { get; set; }
-        public SubnetsOperations SubnetsOperations { get; set; }
-        public PrivateEndpointsOperations PrivateEndpointsOperations { get; set; }
         protected AppConfigurationClientBase(bool isAsync)
             : base(isAsync)
         {
@@ -51,12 +49,8 @@ protected void Initialize()
             PrivateEndpointConnectionsOperations = AppConfigurationManagementClient.PrivateEndpointConnections;
             PrivateLinkResourcesOperations = AppConfigurationManagementClient.PrivateLinkResources;
             Operations = AppConfigurationManagementClient.Operations;
-            ResourcesManagementClient = GetResourceManagementClient();
-            ResourceGroupsOperations = ResourcesManagementClient.ResourceGroups;
-            NetworkManagementClient = GetNetworkManagementClient();
-            VirtualNetworksOperations = NetworkManagementClient.VirtualNetworks;
-            SubnetsOperations = NetworkManagementClient.Subnets;
-            PrivateEndpointsOperations = NetworkManagementClient.PrivateEndpoints;
+            ArmClient = GetArmClient(); // TODO: use base.GetArmClient when switching to new mgmt test framework
+            ResourceGroupContainer = ArmClient.DefaultSubscription.GetResourceGroups();
         }
 
         internal AppConfigurationManagementClient GetAppConfigurationManagementClient()
@@ -65,11 +59,15 @@ internal AppConfigurationManagementClient GetAppConfigurationManagementClient()
                 TestEnvironment.Credential,
                 InstrumentClientOptions(new AppConfigurationManagementClientOptions()));
         }
-        internal NetworkManagementClient GetNetworkManagementClient()
+        internal ArmClient GetArmClient()
         {
-            return CreateClient<NetworkManagementClient>(this.TestEnvironment.SubscriptionId,
+            var options = InstrumentClientOptions(new ArmClientOptions());
+            CleanupPolicy = new ResourceGroupCleanupPolicy();
+            options.AddPolicy(CleanupPolicy, HttpPipelinePosition.PerCall);
+
+            return CreateClient<ArmClient>(this.TestEnvironment.SubscriptionId,
                 TestEnvironment.Credential,
-                InstrumentClientOptions(new NetworkManagementClientOptions()));
+                options);
         }
     }
 }