Skip to content

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

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

Merged
archerzz merged 10 commits into from
Aug 12, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8fe07a7
Follow up PR - 5593 Azure.ResourceManager.Core Readme (#22262)
JonathanCrd Jun 29, 2021
ddf31a6
Add PropertyReferenceType attribute in ResourceIdentity (#22255)
ShivangiReja Jun 29, 2021
2529732
remove resources dependency (#22293)
m-nash Jun 29, 2021
79a4938
Updating GenericResource.Lists to return GenericResourceExpanded. (#2…
allenjzhang Jun 30, 2021
ff7dc59
cleanup the warnings that were supressed (#22318)
m-nash Jun 30, 2021
3ab3261
Exposing expand on ListAtContext as well in preparation to expose tha…
allenjzhang Jul 1, 2021
6aee39f
Merge branch 'feature/mgmt-track2-network' of github.com:archerzz/azu…
archerzz Aug 2, 2021
f08e787
Merge branch 'feature/mgmt-track2-network' of github.com:archerzz/azu…
archerzz Aug 10, 2021
e3583f6
Merge branch 'feature/mgmt-track2-network' of github.com:archerzz/azu…
archerzz Aug 12, 2021
8a9cad2
test(network): clean up some broken test cases
archerzz Aug 11, 2021
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 sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkManagementTestUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
273 changes: 168 additions & 105 deletions sdk/network/Azure.ResourceManager.Network/tests/Helpers/NetworkServiceClientTestBase.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sdk/network/Azure.ResourceManager.Network/tests/Helpers/ResourcesManagementTestUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationGatewayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sdk/network/Azure.ResourceManager.Network/tests/Tests/ApplicationSecurityGroupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
15 changes: 3 additions & 12 deletions sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckConnectivityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions sdk/network/Azure.ResourceManager.Network/tests/Tests/CheckDnsAvailabilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
84 changes: 12 additions & 72 deletions sdk/network/Azure.ResourceManager.Network/tests/Tests/ConnectionMonitorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sdk/network/Azure.ResourceManager.Network/tests/Tests/DdosProtectionPlanTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public async Task ClearChallengeCacheforRecord()
{
Initialize();
}
resourceGroup = (await CreateResourceGroup(Recording.GenerateAssetName(NamePrefix))).Value;
resourceGroup = await CreateResourceGroup(Recording.GenerateAssetName(NamePrefix));
}

[TearDown]
Expand Down
20 changes: 10 additions & 10 deletions sdk/network/Azure.ResourceManager.Network/tests/Tests/ExpandResourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down Expand Up @@ -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);
Expand All @@ -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();

Expand Down Expand Up @@ -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");

Expand All @@ -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");

Expand All @@ -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();
}
}
}
Loading