Skip to content

Commit d30dcd7

Browse files
authored
Fixed network breaking change issue for private dns zone group and updated live test script (#21845)
1 parent 9c706ed commit d30dcd7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/Network/Network.Test/LiveTests/TestLiveScenarios.ps1

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with public IP address" -D
1313

1414
$snet = New-AzVirtualNetworkSubnetConfig -Name $snetName -AddressPrefix 10.0.1.0/24
1515
$vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $vnetName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $snet
16-
$pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
16+
$pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel
1717
$ipcfg = New-AzNetworkInterfaceIpConfig -Name $ipcfgName -Subnet $vnet.Subnets[0] -PublicIpAddress $pip
1818
New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipcfg
1919
$actualNic = Get-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName
@@ -33,7 +33,7 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with public IP address" -D
3333
$actualPip = Get-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName
3434
Assert-AreEqual $rgName $actualPip.ResourceGroupName
3535
Assert-AreEqual $pipName $actualPip.Name
36-
Assert-AreEqual "Dynamic" $actualPip.PublicIpAllocationMethod
36+
Assert-AreEqual "Static" $actualPip.PublicIpAllocationMethod
3737
Assert-AreEqual $actualPip.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
3838

3939
$actualVnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgName
@@ -96,7 +96,7 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with IP configuration" -De
9696
$snet = New-AzVirtualNetworkSubnetConfig -Name $snetName -AddressPrefix 10.0.1.0/24
9797
$vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $vnetName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $snet
9898

99-
$pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
99+
$pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel
100100
$ipconfig1 = New-AzNetworkInterfaceIpConfig -Name $ipconfig1Name -Subnet $vnet.Subnets[0] -PublicIpAddress $pip
101101
$ipconfig2 = New-AzNetworkInterfaceIpConfig -Name $ipconfig2Name -PrivateIpAddressVersion IPv6
102102

@@ -110,7 +110,7 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with IP configuration" -De
110110
$actualPip = Get-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName
111111
Assert-AreEqual $rgName $actualPip.ResourceGroupName
112112
Assert-AreEqual $pipName $actualPip.Name
113-
Assert-AreEqual "Dynamic" $actualPip.PublicIpAllocationMethod
113+
Assert-AreEqual "Static" $actualPip.PublicIpAllocationMethod
114114
Assert-AreEqual $actualPip.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
115115

116116
$actualVnet = Get-AzVirtualNetwork -ResourceGroupName $rgName -Name $vnetName
@@ -123,7 +123,6 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with IP configuration" -De
123123
Assert-AreEqual $ipconfig1Name $actualNic.IpConfigurations[0].Name
124124
Assert-AreEqual $pip.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
125125
Assert-AreEqual $actualVnet.Subnets[0].Id $actualNic.IpConfigurations[0].Subnet.Id
126-
Assert-AreEqual "Dynamic" $actualNic.IpConfigurations[0].PrivateIpAllocationMethod
127126
Assert-AreEqual IPv4 $actualNic.IpConfigurations[0].PrivateIpAddressVersion
128127

129128
Assert-AreEqual $ipconfig2Name $actualNic.IpConfigurations[1].Name
@@ -150,7 +149,7 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with accelerated networkin
150149

151150
$snet = New-AzVirtualNetworkSubnetConfig -Name $snetName -AddressPrefix 10.0.1.0/24
152151
$vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $vnetName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $snet
153-
$pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
152+
$pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel
154153
$ipcfg = New-AzNetworkInterfaceIpConfig -Name $ipcfgName -Subnet $vnet.Subnets[0] -PublicIpAddress $pip
155154
New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipcfg -EnableAcceleratedNetworking
156155

@@ -166,7 +165,7 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with accelerated networkin
166165
$actualPip = Get-AzPublicIpAddress -ResourceGroupName $rgname -name $pipName
167166
Assert-AreEqual $rgName $actualPip.ResourceGroupName
168167
Assert-AreEqual $pipName $actualPip.Name
169-
Assert-AreEqual "Dynamic" $actualPip.PublicIpAllocationMethod
168+
Assert-AreEqual "Static" $actualPip.PublicIpAllocationMethod
170169
Assert-AreEqual $actualPip.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
171170

172171
$actualVnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgName
@@ -230,7 +229,7 @@ Invoke-LiveTestScenario -Name "Create network load balancer" -Description "Test
230229
$lbRuleName = New-LiveTestResourceName
231230
$lbName = New-LiveTestResourceName
232231

233-
$publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Dynamic
232+
$publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static
234233
$feIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $feIpCfgName -PublicIpAddress $publicIp
235234
$bePoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $bePoolCfgName
236235
$probe = New-AzLoadBalancerProbeConfig -Name $probeName -Protocol "Http" -Port 80 -RequestPath "healthcheck.aspx" -IntervalInSeconds 15 -ProbeCount 5 -ProbeThreshold 5
@@ -269,7 +268,7 @@ Invoke-LiveTestScenario -Name "Update network load balancer" -Description "Test
269268
$lbName = New-LiveTestResourceName
270269
$natRuleName = New-LiveTestResourceName
271270

272-
$publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Dynamic
271+
$publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static
273272
$feIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $feIpCfgName -PublicIpAddress $publicIp
274273
$bePoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $bePoolCfgName
275274
$probe = New-AzLoadBalancerProbeConfig -Name $probeName1 -Protocol "Http" -Port 80 -RequestPath "healthcheck80.aspx" -IntervalInSeconds 15 -ProbeCount 5 -ProbeThreshold 5
@@ -315,7 +314,7 @@ Invoke-LiveTestScenario -Name "Remove network load balancer" -Description "Test
315314
$lbRuleName = New-LiveTestResourceName
316315
$lbName = New-LiveTestResourceName
317316

318-
$publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Dynamic
317+
$publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static
319318
$feIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $feIpCfgName -PublicIpAddress $publicIp
320319
$bePoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $bePoolCfgName
321320
$probe = New-AzLoadBalancerProbeConfig -Name $probeName -Protocol "Http" -Port 80 -RequestPath "healthcheck.aspx" -IntervalInSeconds 15 -ProbeCount 5 -ProbeThreshold 5

src/Network/Network/PrivateEndpoint/PrivateDnsZoneGroup/PrivateDnsZoneGroupBaseCmdlet.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ public bool IsPrivateDnsZoneGroupPresent(string resourceGroupName, string privat
3737
var group = GetPrivateDnsZoneGroup(resourceGroupName, privateEndpointName, privateDnsZoneGroupName);
3838
return (group != null);
3939
}
40-
catch (ErrorException exception)
40+
catch (Rest.RestException ex) when (ex is ErrorException || ex is Rest.Azure.CloudException)
4141
{
42+
dynamic exception = ex;
4243
if (exception.Response.StatusCode == HttpStatusCode.NotFound)
4344
{
4445
return false;

0 commit comments

Comments
 (0)