Skip to content

Commit 241ddc5

Browse files
anton-evseevanton-evseev
committed
Updated tests & recordings
1 parent 9d144cb commit 241ddc5

File tree

38 files changed

+11173
-9407
lines changed

38 files changed

+11173
-9407
lines changed

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/AvailableDelegationsTests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Tests checking API to list available delegations.
1919
function Test-GetAvailableDelegationsList
2020
{
2121
$location = Get-ProviderLocation ResourceManagement
22-
$location = $location -replace " ",""
22+
# TODO: replace with Normalize-Location after PR is merged: https://github.com/Azure/azure-powershell-common/pull/90
23+
$location = $location.ToLower() -replace '[^a-z0-9]'
2324
try
2425
{
2526
$results = Get-AzureRmAvailableServiceDelegation -Location $location;

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/AvailableEndpointServicesTests.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ function Test-VirtualNetworkAvailableEndpointServicesList
2020
{
2121
$resourceTypeParent = "Microsoft.Network/virtualNetworks"
2222
$location = Get-ProviderLocation $resourceTypeParent
23-
$location = $location -replace " ",""
23+
# TODO: replace with Normalize-Location after PR is merged: https://github.com/Azure/azure-powershell-common/pull/90
24+
$location = $location.ToLower() -replace '[^a-z0-9]'
2425
try
2526
{
2627
$results = Get-AzureRmVirtualNetworkAvailableEndpointService -Location $location;

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/AzureFirewallTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function Test-AzureFirewallCRUD
2222
$rgname = Get-ResourceGroupName
2323
$azureFirewallName = Get-ResourceName
2424
$resourceTypeParent = "Microsoft.Network/AzureFirewalls"
25-
$location = Get-ProviderLocation $resourceTypeParent "West Central US"
25+
$location = Get-ProviderLocation $resourceTypeParent "westcentralus"
2626

2727
$vnetName = Get-ResourceName
2828
$subnetName = "AzureFirewallSubnet"
@@ -349,7 +349,7 @@ function Test-AzureFirewallAllocateAndDeallocate
349349
$rgname = Get-ResourceGroupName
350350
$azureFirewallName = Get-ResourceName
351351
$resourceTypeParent = "Microsoft.Network/AzureFirewalls"
352-
$location = Get-ProviderLocation $resourceTypeParent "West Central US"
352+
$location = Get-ProviderLocation $resourceTypeParent "westcentralus"
353353

354354
$vnetName = Get-ResourceName
355355
$subnetName = "AzureFirewallSubnet"

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/Common.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function Get-NetworkTestMode {
5757
.SYNOPSIS
5858
Gets the default location for a provider
5959
#>
60-
function Get-ProviderLocation($provider, $preferredLocation = "West US")
60+
function Get-ProviderLocation($provider, $preferredLocation = "West Central US")
6161
{
6262
if((Get-NetworkTestMode) -ne 'Playback')
6363
{

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/Generated/ApplicationSecurityGroupTestsGenerated.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ public ApplicationSecurityGroupTestsGenerated(Xunit.Abstractions.ITestOutputHelp
4848
[Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
4949
public void TestApplicationSecurityGroupCRUDMinimalParameters()
5050
{
51-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupCRUDMinimalParameters"));
51+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ApplicationSecurityGroupCRUDMinimalParameters");
5252
}
5353

5454
[Fact]
5555
[Trait(Category.AcceptanceType, Category.CheckIn)]
5656
[Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
5757
public void TestApplicationSecurityGroupCRUDAllParameters()
5858
{
59-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupCRUDAllParameters"));
59+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ApplicationSecurityGroupCRUDAllParameters");
6060
}
6161
}
6262
}

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/Generated/ApplicationSecurityGroupTestsGenerated.ps1

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ function Test-ApplicationSecurityGroupCRUDMinimalParameters
6464
Assert-True { Check-CmdletReturnType "Get-AzureRmApplicationSecurityGroup" $vApplicationSecurityGroup };
6565
Assert-AreEqual $rname $vApplicationSecurityGroup.Name;
6666

67+
# Get all ApplicationSecurityGroups in resource group
68+
$listApplicationSecurityGroup = Get-AzureRmApplicationSecurityGroup -ResourceGroupName $rgname;
69+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
70+
71+
# Get all ApplicationSecurityGroups in subscription
72+
$listApplicationSecurityGroup = Get-AzureRmApplicationSecurityGroup;
73+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
74+
6775
# Remove ApplicationSecurityGroup
6876
$job = Remove-AzureRmApplicationSecurityGroup -ResourceGroupName $rgname -Name $rname -PassThru -Force -AsJob;
6977
$job | Wait-Job;
@@ -112,6 +120,14 @@ function Test-ApplicationSecurityGroupCRUDAllParameters
112120
Assert-AreEqual $rname $vApplicationSecurityGroup.Name;
113121
Assert-AreEqualObjectProperties $Tag $vApplicationSecurityGroup.Tag;
114122

123+
# Get all ApplicationSecurityGroups in resource group
124+
$listApplicationSecurityGroup = Get-AzureRmApplicationSecurityGroup -ResourceGroupName $rgname;
125+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
126+
127+
# Get all ApplicationSecurityGroups in subscription
128+
$listApplicationSecurityGroup = Get-AzureRmApplicationSecurityGroup;
129+
Assert-NotNull ($listApplicationSecurityGroup | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
130+
115131
# Remove ApplicationSecurityGroup
116132
$job = Remove-AzureRmApplicationSecurityGroup -ResourceGroupName $rgname -Name $rname -PassThru -Force -AsJob;
117133
$job | Wait-Job;

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/Generated/LoadBalancerTestsGenerated.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,119 +48,119 @@ public LoadBalancerTestsGenerated(Xunit.Abstractions.ITestOutputHelper output)
4848
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
4949
public void TestLoadBalancerCRUDMinimalParameters()
5050
{
51-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-LoadBalancerCRUDMinimalParameters"));
51+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUDMinimalParameters");
5252
}
5353

5454
[Fact]
5555
[Trait(Category.AcceptanceType, Category.CheckIn)]
5656
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
5757
public void TestLoadBalancerCRUDAllParameters()
5858
{
59-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-LoadBalancerCRUDAllParameters"));
59+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUDAllParameters");
6060
}
6161

6262
[Fact]
6363
[Trait(Category.AcceptanceType, Category.CheckIn)]
6464
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
6565
public void TestFrontendIPConfigurationCRUDMinimalParameters()
6666
{
67-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-FrontendIPConfigurationCRUDMinimalParameters"));
67+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-FrontendIPConfigurationCRUDMinimalParameters");
6868
}
6969

7070
[Fact]
7171
[Trait(Category.AcceptanceType, Category.CheckIn)]
7272
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
7373
public void TestFrontendIPConfigurationCRUDAllParameters()
7474
{
75-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-FrontendIPConfigurationCRUDAllParameters"));
75+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-FrontendIPConfigurationCRUDAllParameters");
7676
}
7777

7878
[Fact]
7979
[Trait(Category.AcceptanceType, Category.CheckIn)]
8080
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
8181
public void TestBackendAddressPoolCRUDMinimalParameters()
8282
{
83-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-BackendAddressPoolCRUDMinimalParameters"));
83+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-BackendAddressPoolCRUDMinimalParameters");
8484
}
8585

8686
[Fact]
8787
[Trait(Category.AcceptanceType, Category.CheckIn)]
8888
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
8989
public void TestLoadBalancingRuleCRUDMinimalParameters()
9090
{
91-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-LoadBalancingRuleCRUDMinimalParameters"));
91+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancingRuleCRUDMinimalParameters");
9292
}
9393

9494
[Fact]
9595
[Trait(Category.AcceptanceType, Category.CheckIn)]
9696
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
9797
public void TestLoadBalancingRuleCRUDAllParameters()
9898
{
99-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-LoadBalancingRuleCRUDAllParameters"));
99+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancingRuleCRUDAllParameters");
100100
}
101101

102102
[Fact]
103103
[Trait(Category.AcceptanceType, Category.CheckIn)]
104104
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
105105
public void TestProbeCRUDMinimalParameters()
106106
{
107-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ProbeCRUDMinimalParameters"));
107+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ProbeCRUDMinimalParameters");
108108
}
109109

110110
[Fact]
111111
[Trait(Category.AcceptanceType, Category.CheckIn)]
112112
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
113113
public void TestProbeCRUDAllParameters()
114114
{
115-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ProbeCRUDAllParameters"));
115+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ProbeCRUDAllParameters");
116116
}
117117

118118
[Fact]
119119
[Trait(Category.AcceptanceType, Category.CheckIn)]
120120
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
121121
public void TestInboundNatRuleCRUDMinimalParameters()
122122
{
123-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-InboundNatRuleCRUDMinimalParameters"));
123+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatRuleCRUDMinimalParameters");
124124
}
125125

126126
[Fact]
127127
[Trait(Category.AcceptanceType, Category.CheckIn)]
128128
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
129129
public void TestInboundNatRuleCRUDAllParameters()
130130
{
131-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-InboundNatRuleCRUDAllParameters"));
131+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatRuleCRUDAllParameters");
132132
}
133133

134134
[Fact]
135135
[Trait(Category.AcceptanceType, Category.CheckIn)]
136136
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
137137
public void TestInboundNatPoolCRUDMinimalParameters()
138138
{
139-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-InboundNatPoolCRUDMinimalParameters"));
139+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatPoolCRUDMinimalParameters");
140140
}
141141

142142
[Fact]
143143
[Trait(Category.AcceptanceType, Category.CheckIn)]
144144
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
145145
public void TestInboundNatPoolCRUDAllParameters()
146146
{
147-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-InboundNatPoolCRUDAllParameters"));
147+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatPoolCRUDAllParameters");
148148
}
149149

150150
[Fact]
151151
[Trait(Category.AcceptanceType, Category.CheckIn)]
152152
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
153153
public void TestOutboundRuleCRUDMinimalParameters()
154154
{
155-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-OutboundRuleCRUDMinimalParameters"));
155+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-OutboundRuleCRUDMinimalParameters");
156156
}
157157

158158
[Fact]
159159
[Trait(Category.AcceptanceType, Category.CheckIn)]
160160
[Trait(Category.Owner, NrpTeamAlias.slbdev)]
161161
public void TestOutboundRuleCRUDAllParameters()
162162
{
163-
NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-OutboundRuleCRUDAllParameters"));
163+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-OutboundRuleCRUDAllParameters");
164164
}
165165
}
166166
}

0 commit comments

Comments
 (0)