test(network): clean up some broken test cases (#23265)

* Follow up PR - 5593 Azure.ResourceManager.Core Readme (#22262) * Change the accessbility to virtual for Resource.Id * Changing temporary links to absolute ones. Co-authored-by: YalinLi0312 <[email protected]> Co-authored-by: m-nash <[email protected]> Co-authored-by: m-nash <[email protected]> * Add PropertyReferenceType attribute in ResourceIdentity (#22255) * Add PropertyReferenceTypeAttribute attribute in ResourceIdentity * Feedback * remove resources dependency (#22293) * wip * remove remaining references to azure.resourcemanager.resources * update tests to handle new changes * update summary for gets or sets * Updating GenericResource.Lists to return GenericResourceExpanded. (#22284) * Updating GenericResourceList to return GenericResourceExpanded * Added missing expand and related test cases. * Adding missing test recordings. * cleanup the warnings that were supressed (#22318) * fix CA1036 * remove CA1067 * remove CA1065 * remove SA1028 * Exposing expand on ListAtContext as well in preparation to expose that in each of the generated ListAsGeneric methods in autorest (#22351) * Updating GenericResourceList to return GenericResourceExpanded * Added missing expand and related test cases. * Adding missing test recordings. * Exposing expand on ListAtContext as well in preparation to expose that in each of the generated ListAsGeneric methods in autorest * test(network): clean up some broken test cases ## Update the depending libraries: - update `Azure.ResourceManager` to version `1.0.0-alpha.20210804.1` - remove `Azure.ResourceManager.Resource` - we should restore to use the new release later - remove `Azure.ResourceManager.Storage` - we should change to use `Azure.ResourceManager` later - update `Azure.ResourceManager.Compute` to latest dev build version - we should change to use `Azure.ResourceManager.Resource` later ## Disable test cases disable the following storage related test cases which are not required for preview, but we may restore them afterwards. - FlowLogTests - TroubleshootTests ## Other Changes - Implement `CreateWindowsVM` and `CreateLinuxVM` using compute SDK - Change return value of `CreateResourceGroup` to `Task<ResourceGroup>` - Fix some broken API due to removal of `ResourceGroupsOperations` - Fix synchronous invocation in `NextHopTests` AB#6018 Co-authored-by: Jonathan Cárdenas <[email protected]> Co-authored-by: YalinLi0312 <[email protected]> Co-authored-by: m-nash <[email protected]> Co-authored-by: m-nash <[email protected]> Co-authored-by: ShivangiReja <[email protected]> Co-authored-by: m-nash <[email protected]> Co-authored-by: Allen Zhang <[email protected]>
Azure · Aug 12, 2021 · 9bd9e69 · 9bd9e69
1 parent b46f1ae
commit 9bd9e69
Show file tree

Hide file tree

Showing 37 changed files with 336 additions and 432 deletions.
diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkManagementTestUtilities.cs b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkManagementTestUtilities.cs
@@ -39,7 +39,7 @@ public static async Task<string> GetResourceLocation(ArmClient client, string re
             }
             string[] parts = resourceType.Split('/');
             string providerName = parts[0];
-            ProviderInfo provider = await client.GetProviderAsync(providerName);
+            var provider = (await client.GetProviderAsync(providerName)).Value;
             foreach (var resource in provider.ResourceTypes)
             {
                 if (string.Equals(resource.ResourceType, parts[1], StringComparison.OrdinalIgnoreCase))

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkServiceClientTestBase.cs b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkServiceClientTestBase.cs
diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Helpers/ResourcesManagementTestUtilities.cs b/sdk/network/Azure.ResourceManager.Network/tests/Helpers/ResourcesManagementTestUtilities.cs
@@ -23,7 +23,7 @@ public static async Task<string> GetResourceLocation(ArmClient client, string re
             string location = null;
             string[] parts = resourceType.Split('/');
             string providerName = parts[0];
-            ProviderInfo provider = await client.GetProviderAsync(providerName);
+            var provider = (await client.GetProviderAsync(providerName)).Value;
             foreach (var resource in provider.ResourceTypes)
             {
                 if (string.Equals(resource.ResourceType, parts[1], StringComparison.OrdinalIgnoreCase))

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationGatewayTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationGatewayTests.cs
@@ -7,8 +7,6 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Azure.Core.TestFramework;
-using Azure.ResourceManager.Compute;
-using Azure.ResourceManager.Compute.Models;
 using Azure.ResourceManager.Resources;
 using Azure.ResourceManager.Resources.Models;
 using Azure.ResourceManager.Network.Models;

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationSecurityGroupTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationSecurityGroupTests.cs
@@ -38,7 +38,7 @@ public void ClearChallengeCacheforRecord()
         public async Task<ApplicationSecurityGroupContainer> GetContainer()
         {
             var resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName("test_application_security_group_"));
-            return resourceGroup.Value.GetApplicationSecurityGroups();
+            return resourceGroup.GetApplicationSecurityGroups();
         }
 
         [Test]

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckConnectivityTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckConnectivityTests.cs
@@ -36,28 +36,19 @@ public void ClearChallengeCacheforRecord()
         //}
 
         [Test]
+        [RecordedTest]
         public async Task CheckConnectivityVmToInternetTest()
         {
             string resourceGroupName = Recording.GenerateAssetName("azsmnet");
 
             string location = "westus2";
-            ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location));
+            var resourceGroup = await CreateResourceGroup(resourceGroupName, location);
             string virtualMachineName = Recording.GenerateAssetName("azsmnet");
             string networkInterfaceName = Recording.GenerateAssetName("azsmnet");
             string networkSecurityGroupName = virtualMachineName + "-nsg";
 
             //Deploy VM with a template
-            VirtualMachine vm = await CreateVm(
-                resourceGroupName: resourceGroupName,
-                location: location,
-                virtualMachineName: virtualMachineName,
-                storageAccountName: Recording.GenerateAssetName("azsmnet"),
-                networkInterfaceName: networkInterfaceName,
-                networkSecurityGroupName: networkSecurityGroupName,
-                diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"),
-                deploymentName: Recording.GenerateAssetName("azsmnet"),
-                adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#")
-                );
+            var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup);
 
             //Deploy networkWatcherAgent on VM
             VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location)

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckDnsAvailabilityTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckDnsAvailabilityTests.cs
@@ -31,14 +31,12 @@ public void ClearChallengeCacheforRecord()
         //}
 
         [Test]
+        [RecordedTest]
         public async Task CheckDnsAvailabilityTest()
         {
-            string location = await NetworkManagementTestUtilities.GetResourceLocation(ArmClient, "Microsoft.Network/publicIPAddresses");
-            location = location.Replace(" ", "");
-
             string domainNameLabel = Recording.GenerateAssetName("domainnamelabel");
 
-            Response<Models.DnsNameAvailabilityResult> dnsNameAvailability = await ArmClient.DefaultSubscription.CheckDnsNameAvailabilityAsync(location, domainNameLabel);
+            Response<Models.DnsNameAvailabilityResult> dnsNameAvailability = await ArmClient.DefaultSubscription.CheckDnsNameAvailabilityAsync(TestEnvironment.Location, domainNameLabel);
 
             Assert.True(dnsNameAvailability.Value.Available);
         }

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ConnectionMonitorTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ConnectionMonitorTests.cs
@@ -50,23 +50,13 @@ public async Task PutConnectionMonitorTest()
             string resourceGroupName = Recording.GenerateAssetName("azsmnet");
 
             string location = "westus2";
-            ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location));
+            var resourceGroup = await CreateResourceGroup(resourceGroupName, location);
             string virtualMachineName = Recording.GenerateAssetName("azsmnet");
             string networkInterfaceName = Recording.GenerateAssetName("azsmnet");
             string networkSecurityGroupName = virtualMachineName + "-nsg";
 
             //Deploy VM with a template
-            VirtualMachine vm = await CreateVm(
-                 resourceGroupName: resourceGroupName,
-                 location: location,
-                 virtualMachineName: virtualMachineName,
-                 storageAccountName: Recording.GenerateAssetName("azsmnet"),
-                 networkInterfaceName: networkInterfaceName,
-                 networkSecurityGroupName: networkSecurityGroupName,
-                 diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"),
-                 deploymentName: Recording.GenerateAssetName("azsmnet"),
-                 adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#")
-                 );
+            var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup);
 
             //Deploy networkWatcherAgent on VM
             VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location)
@@ -117,24 +107,14 @@ public async Task StartConnectionMonitorTest()
             string resourceGroupName = Recording.GenerateAssetName("azsmnet");
 
             string location = "westus2";
-            ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location));
+            var resourceGroup = await CreateResourceGroup(resourceGroupName, location);
 
             string virtualMachineName = Recording.GenerateAssetName("azsmnet");
             string networkInterfaceName = Recording.GenerateAssetName("azsmnet");
             string networkSecurityGroupName = virtualMachineName + "-nsg";
 
             //Deploy VM with a template
-            VirtualMachine vm = await CreateVm(
-                 resourceGroupName: resourceGroupName,
-                 location: location,
-                 virtualMachineName: virtualMachineName,
-                 storageAccountName: Recording.GenerateAssetName("azsmnet"),
-                 networkInterfaceName: networkInterfaceName,
-                 networkSecurityGroupName: networkSecurityGroupName,
-                 diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"),
-                 deploymentName: Recording.GenerateAssetName("azsmnet"),
-                 adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#")
-                 );
+            var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup);
 
             //Deploy networkWatcherAgent on VM
             VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location)
@@ -185,23 +165,13 @@ public async Task StopConnectionMonitorTest()
             string resourceGroupName = Recording.GenerateAssetName("azsmnet");
 
             string location = "westus2";
-            ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location));
+            var resourceGroup = await CreateResourceGroup(resourceGroupName, location);
             string virtualMachineName = Recording.GenerateAssetName("azsmnet");
             string networkInterfaceName = Recording.GenerateAssetName("azsmnet");
             string networkSecurityGroupName = virtualMachineName + "-nsg";
 
             //Deploy VM with a template
-            VirtualMachine vm = await CreateVm(
-                resourceGroupName: resourceGroupName,
-                location: location,
-                virtualMachineName: virtualMachineName,
-                storageAccountName: Recording.GenerateAssetName("azsmnet"),
-                networkInterfaceName: networkInterfaceName,
-                networkSecurityGroupName: networkSecurityGroupName,
-                diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"),
-                deploymentName: Recording.GenerateAssetName("azsmnet"),
-                adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#")
-                );
+            var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup);
 
             //Deploy networkWatcherAgent on VM
             VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location)
@@ -251,23 +221,13 @@ public async Task QueryConnectionMonitorTest()
             string resourceGroupName = Recording.GenerateAssetName("azsmnet");
 
             string location = "westus2";
-            ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location));
+            var resourceGroup = await CreateResourceGroup(resourceGroupName, location);
             string virtualMachineName = Recording.GenerateAssetName("azsmnet");
             string networkInterfaceName = Recording.GenerateAssetName("azsmnet");
             string networkSecurityGroupName = virtualMachineName + "-nsg";
 
             //Deploy VM with a template
-            VirtualMachine vm = await CreateVm(
-                resourceGroupName: resourceGroupName,
-                location: location,
-                virtualMachineName: virtualMachineName,
-                storageAccountName: Recording.GenerateAssetName("azsmnet"),
-                networkInterfaceName: networkInterfaceName,
-                networkSecurityGroupName: networkSecurityGroupName,
-                diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"),
-                deploymentName: Recording.GenerateAssetName("azsmnet"),
-                adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#")
-                );
+            var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup);
 
             //Deploy networkWatcherAgent on VM
             VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location)
@@ -323,23 +283,13 @@ public async Task UpdateConnectionMonitorTest()
             string resourceGroupName = Recording.GenerateAssetName("azsmnet");
 
             string location = "westus2";
-            ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location));
+            var resourceGroup = await CreateResourceGroup (resourceGroupName, location);
             string virtualMachineName = Recording.GenerateAssetName("azsmnet");
             string networkInterfaceName = Recording.GenerateAssetName("azsmnet");
             string networkSecurityGroupName = virtualMachineName + "-nsg";
 
             //Deploy VM with a template
-            VirtualMachine vm = await CreateVm(
-                resourceGroupName: resourceGroupName,
-                location: location,
-                virtualMachineName: virtualMachineName,
-                storageAccountName: Recording.GenerateAssetName("azsmnet"),
-                networkInterfaceName: networkInterfaceName,
-                networkSecurityGroupName: networkSecurityGroupName,
-                diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"),
-                deploymentName: Recording.GenerateAssetName("azsmnet"),
-                adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#")
-                );
+            var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup);
 
             //Deploy networkWatcherAgent on VM
             VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location)
@@ -388,23 +338,13 @@ public async Task DeleteConnectionMonitorTest()
             string resourceGroupName = Recording.GenerateAssetName("azsmnet");
 
             string location = "westus2";
-            ResourceGroup rg = await ArmClient.DefaultSubscription.GetResourceGroups().CreateOrUpdateAsync(resourceGroupName, new ResourceGroupData(location));
+            var resourceGroup = await CreateResourceGroup (resourceGroupName, location);
             string virtualMachineName = Recording.GenerateAssetName("azsmnet");
             string networkInterfaceName = Recording.GenerateAssetName("azsmnet");
             string networkSecurityGroupName = virtualMachineName + "-nsg";
 
             //Deploy VM with a template
-            VirtualMachine vm = await CreateVm(
-                resourceGroupName: resourceGroupName,
-                location: location,
-                virtualMachineName: virtualMachineName,
-                storageAccountName: Recording.GenerateAssetName("azsmnet"),
-                networkInterfaceName: networkInterfaceName,
-                networkSecurityGroupName: networkSecurityGroupName,
-                diagnosticsStorageAccountName: Recording.GenerateAssetName("azsmnet"),
-                deploymentName: Recording.GenerateAssetName("azsmnet"),
-                adminPassword: Recording.GenerateAlphaNumericId("AzureSDKNetworkTest#")
-                );
+            var vm = await CreateWindowsVM(virtualMachineName, networkInterfaceName, location, resourceGroup);
 
             //Deploy networkWatcherAgent on VM
             VirtualMachineExtensionData parameters = new VirtualMachineExtensionData(location)

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/DdosProtectionPlanTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/DdosProtectionPlanTests.cs
@@ -30,7 +30,7 @@ public async Task ClearChallengeCacheforRecord()
             {
                 Initialize();
             }
-            resourceGroup = (await CreateResourceGroup(Recording.GenerateAssetName(NamePrefix))).Value;
+            resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName(NamePrefix));
         }
 
         [TearDown]

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Tests/ExpandResourceTests.cs b/sdk/network/Azure.ResourceManager.Network/tests/Tests/ExpandResourceTests.cs
@@ -51,12 +51,12 @@ public async Task ExpandResourceTest()
                 lbPublicIpName,
                 lbDomaingNameLabel,
                 location,
-                resourceGroup.Value.GetPublicIPAddresses());
+                resourceGroup.GetPublicIPAddresses());
 
             // Create Vnet
             string vnetName = Recording.GenerateAssetName("azsmnet");
             string subnetName = Recording.GenerateAssetName("azsmnet");
-            VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.Value.GetVirtualNetworks());
+            VirtualNetwork vnet = await CreateVirtualNetwork(vnetName, subnetName, location, resourceGroup.GetVirtualNetworks());
 
             // Create Nics
             string nic1name = Recording.GenerateAssetName("azsmnet");
@@ -69,23 +69,23 @@ public async Task ExpandResourceTest()
                 vnet.Data.Subnets[0].Id,
                 location,
                 "ipconfig",
-                resourceGroup.Value.GetNetworkInterfaces());
+                resourceGroup.GetNetworkInterfaces());
 
             NetworkInterface nic2 = await CreateNetworkInterface(
                 nic2name,
                 null,
                 vnet.Data.Subnets[0].Id,
                 location,
                 "ipconfig",
-                resourceGroup.Value.GetNetworkInterfaces());
+                resourceGroup.GetNetworkInterfaces());
 
             NetworkInterface nic3 = await CreateNetworkInterface(
                 nic3name,
                 null,
                 vnet.Data.Subnets[0].Id,
                 location,
                 "ipconfig",
-                resourceGroup.Value.GetNetworkInterfaces());
+                resourceGroup.GetNetworkInterfaces());
 
             // Create the LoadBalancer
             var lbName = Recording.GenerateAssetName("azsmnet");
@@ -186,7 +186,7 @@ public async Task ExpandResourceTest()
             };
 
             // Create the loadBalancer
-            var loadBalancerContainer = resourceGroup.Value.GetLoadBalancers();
+            var loadBalancerContainer = resourceGroup.GetLoadBalancers();
             Operation<LoadBalancer> putLoadBalancerOperation = await loadBalancerContainer.StartCreateOrUpdateAsync(lbName, loadBalancer);
             await putLoadBalancerOperation.WaitForCompletionAsync();
             Response<LoadBalancer> getLoadBalancer = await loadBalancerContainer.GetAsync(lbName);
@@ -205,7 +205,7 @@ public async Task ExpandResourceTest()
             nic3.Data.IpConfigurations.First().LoadBalancerBackendAddressPools.Add(getLoadBalancer.Value.Data.BackendAddressPools.First());
 
             // Put Nics
-            var networkInterfaceContainer = resourceGroup.Value.GetNetworkInterfaces();
+            var networkInterfaceContainer = resourceGroup.GetNetworkInterfaces();
             var createOrUpdateOperation1 = await networkInterfaceContainer.StartCreateOrUpdateAsync(nic1name, nic1.Data);
             await createOrUpdateOperation1.WaitForCompletionAsync();
 
@@ -269,7 +269,7 @@ public async Task ExpandResourceTest()
             }
 
             // Get subnet with expanded ipconfigurations
-            Response<Subnet> subnet = await resourceGroup.Value.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(
+            Response<Subnet> subnet = await resourceGroup.GetVirtualNetworks().Get(vnetName).Value.GetSubnets().GetAsync(
                 subnetName,
                 "IPConfigurations");
 
@@ -282,7 +282,7 @@ public async Task ExpandResourceTest()
             }
 
             // Get publicIPAddress with expanded ipconfigurations
-            Response<PublicIPAddress> publicip = await resourceGroup.Value.GetPublicIPAddresses().GetAsync(
+            Response<PublicIPAddress> publicip = await resourceGroup.GetPublicIPAddresses().GetAsync(
                 lbPublicIpName,
                 "IPConfiguration");
 
@@ -307,7 +307,7 @@ public async Task ExpandResourceTest()
             await networkInterfaceContainer.Get(nic3name).Value.StartDeleteAsync();
 
             // Delete all PublicIPAddresses
-            await resourceGroup.Value.GetPublicIPAddresses().Get(lbPublicIpName).Value.StartDeleteAsync();
+            await resourceGroup.GetPublicIPAddresses().Get(lbPublicIpName).Value.StartDeleteAsync();
         }
     }
 }