From c0222b7f4a13364db00da5fe0df230e688897768 Mon Sep 17 00:00:00 2001 From: Vincent Dai <23257217+vidai-msft@users.noreply.github.com> Date: Tue, 18 Mar 2025 16:29:08 +0800 Subject: [PATCH 1/2] Add service tag for public ip in live tests. --- .../LiveTests/Network/TestLiveScenarios.ps1 | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/Network/LiveTests/Network/TestLiveScenarios.ps1 b/src/Network/LiveTests/Network/TestLiveScenarios.ps1 index 48555e0f8d53..ef4985492217 100644 --- a/src/Network/LiveTests/Network/TestLiveScenarios.ps1 +++ b/src/Network/LiveTests/Network/TestLiveScenarios.ps1 @@ -13,7 +13,8 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with public IP address" -D $snet = New-AzVirtualNetworkSubnetConfig -Name $snetName -AddressPrefix 10.0.1.0/24 $vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $vnetName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $snet - $pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel + $ipTag = New-AzPublicIpTag -IpTagType FirstPartyUsage -Tag "/NonProd" + $pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel -IpTag $ipTag $ipcfg = New-AzNetworkInterfaceIpConfig -Name $ipcfgName -Subnet $vnet.Subnets[0] -PublicIpAddress $pip New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipcfg $actualNic = Get-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName @@ -96,11 +97,12 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with IP configuration" -De $snet = New-AzVirtualNetworkSubnetConfig -Name $snetName -AddressPrefix 10.0.1.0/24 $vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $vnetName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $snet - $pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel + $ipTag = New-AzPublicIpTag -IpTagType FirstPartyUsage -Tag "/NonProd" + $pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel -IpTag $ipTag $ipconfig1 = New-AzNetworkInterfaceIpConfig -Name $ipconfig1Name -Subnet $vnet.Subnets[0] -PublicIpAddress $pip $ipconfig2 = New-AzNetworkInterfaceIpConfig -Name $ipconfig2Name -PrivateIpAddressVersion IPv6 - New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipconfig1,$ipconfig2 -Tag @{ testtag = "testval" } + New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipconfig1, $ipconfig2 -Tag @{ testtag = "testval" } $actualNic = Get-AzNetworkInterface -Name $nicName -ResourceGroupName $rgName Assert-AreEqual $rgName $actualNic.ResourceGroupName @@ -149,7 +151,8 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with accelerated networkin $snet = New-AzVirtualNetworkSubnetConfig -Name $snetName -AddressPrefix 10.0.1.0/24 $vnet = New-AzVirtualNetwork -ResourceGroupName $rgName -Name $vnetName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $snet - $pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel + $ipTag = New-AzPublicIpTag -IpTagType FirstPartyUsage -Tag "/NonProd" + $pip = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $pipName -Location $location -AllocationMethod Static -DomainNameLabel $domainNameLabel -IpTag $ipTag $ipcfg = New-AzNetworkInterfaceIpConfig -Name $ipcfgName -Subnet $vnet.Subnets[0] -PublicIpAddress $pip New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipcfg -EnableAcceleratedNetworking @@ -197,7 +200,7 @@ Invoke-LiveTestScenario -Name "Network private link service" -Description "Test $feSubnet = New-AzVirtualNetworkSubnetConfig -Name $feSnetName -AddressPrefix 10.0.1.0/24 $beSubnet = New-AzVirtualNetworkSubnetConfig -Name $beSnetName -AddressPrefix 10.0.2.0/24 $oSubnet = New-AzVirtualNetworkSubnetConfig -Name $oSnetName -AddressPrefix 10.0.3.0/24 -PrivateLinkServiceNetworkPoliciesFlag Disabled - $vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $feSubnet,$beSubnet,$oSubnet + $vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $feSubnet, $beSubnet, $oSubnet $lbIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $lbIpCfgName -PrivateIpAddress 10.0.1.5 -Subnet $vnet.Subnets[0] $lbPoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $lbPoolCfgName @@ -229,7 +232,8 @@ Invoke-LiveTestScenario -Name "Create network load balancer" -Description "Test $lbRuleName = New-LiveTestResourceName $lbName = New-LiveTestResourceName - $publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static + $ipTag = New-AzPublicIpTag -IpTagType FirstPartyUsage -Tag "/NonProd" + $publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static -IpTag $ipTag $feIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $feIpCfgName -PublicIpAddress $publicIp $bePoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $bePoolCfgName $probe = New-AzLoadBalancerProbeConfig -Name $probeName -Protocol "Http" -Port 80 -RequestPath "healthcheck.aspx" -IntervalInSeconds 15 -ProbeCount 5 -ProbeThreshold 5 @@ -268,7 +272,8 @@ Invoke-LiveTestScenario -Name "Update network load balancer" -Description "Test $lbName = New-LiveTestResourceName $natRuleName = New-LiveTestResourceName - $publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static + $ipTag = New-AzPublicIpTag -IpTagType FirstPartyUsage -Tag "/NonProd" + $publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static -IpTag $ipTag $feIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $feIpCfgName -PublicIpAddress $publicIp $bePoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $bePoolCfgName $probe = New-AzLoadBalancerProbeConfig -Name $probeName1 -Protocol "Http" -Port 80 -RequestPath "healthcheck80.aspx" -IntervalInSeconds 15 -ProbeCount 5 -ProbeThreshold 5 @@ -314,7 +319,8 @@ Invoke-LiveTestScenario -Name "Remove network load balancer" -Description "Test $lbRuleName = New-LiveTestResourceName $lbName = New-LiveTestResourceName - $publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static + $ipTag = New-AzPublicIpTag -IpTagType FirstPartyUsage -Tag "/NonProd" + $publicIp = New-AzPublicIpAddress -ResourceGroupName $rgName -Name $publicIpName -Location $location -AllocationMethod Static -IpTag $ipTag $feIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $feIpCfgName -PublicIpAddress $publicIp $bePoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $bePoolCfgName $probe = New-AzLoadBalancerProbeConfig -Name $probeName -Protocol "Http" -Port 80 -RequestPath "healthcheck.aspx" -IntervalInSeconds 15 -ProbeCount 5 -ProbeThreshold 5 @@ -444,7 +450,7 @@ Invoke-LiveTestScenario -Name "Create private DNS zone group" -Description "Test New-AzPrivateEndpoint -ResourceGroupName $rgName -Name $peName -Location $location -Subnet $feSnet -PrivateLinkServiceConnection $plsConn New-AzPrivateDnsZone -ResourceGroupName $rgName -Name $zoneName - $zone = Get-AzPrivateDnsZone -ResourceGroupName $rgName -Name $zoneName + $zone = Get-AzPrivateDnsZone -ResourceGroupName $rgName -Name $zoneName $zoneCfg = New-AzPrivateDnsZoneConfig -Name $zoneCfgName -PrivateDnsZoneId $zone.ResourceId New-AzPrivateDnsZoneGroup -ResourceGroupName $rgName -Name $zoneGroupName -PrivateEndpointName $peName -PrivateDnsZoneConfig $zoneCfg From a402a3e5194bbf680d8977468156f78dab326502 Mon Sep 17 00:00:00 2001 From: Vincent Dai <23257217+vidai-msft@users.noreply.github.com> Date: Tue, 18 Mar 2025 16:38:18 +0800 Subject: [PATCH 2/2] Remove spaces --- src/Network/LiveTests/Network/TestLiveScenarios.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Network/LiveTests/Network/TestLiveScenarios.ps1 b/src/Network/LiveTests/Network/TestLiveScenarios.ps1 index ef4985492217..2ab6a788fe35 100644 --- a/src/Network/LiveTests/Network/TestLiveScenarios.ps1 +++ b/src/Network/LiveTests/Network/TestLiveScenarios.ps1 @@ -102,7 +102,7 @@ Invoke-LiveTestScenario -Name "Network interface CRUD with IP configuration" -De $ipconfig1 = New-AzNetworkInterfaceIpConfig -Name $ipconfig1Name -Subnet $vnet.Subnets[0] -PublicIpAddress $pip $ipconfig2 = New-AzNetworkInterfaceIpConfig -Name $ipconfig2Name -PrivateIpAddressVersion IPv6 - New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipconfig1, $ipconfig2 -Tag @{ testtag = "testval" } + New-AzNetworkInterface -ResourceGroupName $rgName -Name $nicName -Location $location -IpConfiguration $ipconfig1,$ipconfig2 -Tag @{ testtag = "testval" } $actualNic = Get-AzNetworkInterface -Name $nicName -ResourceGroupName $rgName Assert-AreEqual $rgName $actualNic.ResourceGroupName @@ -200,7 +200,7 @@ Invoke-LiveTestScenario -Name "Network private link service" -Description "Test $feSubnet = New-AzVirtualNetworkSubnetConfig -Name $feSnetName -AddressPrefix 10.0.1.0/24 $beSubnet = New-AzVirtualNetworkSubnetConfig -Name $beSnetName -AddressPrefix 10.0.2.0/24 $oSubnet = New-AzVirtualNetworkSubnetConfig -Name $oSnetName -AddressPrefix 10.0.3.0/24 -PrivateLinkServiceNetworkPoliciesFlag Disabled - $vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $feSubnet, $beSubnet, $oSubnet + $vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgName -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $feSubnet,$beSubnet,$oSubnet $lbIpCfg = New-AzLoadBalancerFrontendIpConfig -Name $lbIpCfgName -PrivateIpAddress 10.0.1.5 -Subnet $vnet.Subnets[0] $lbPoolCfg = New-AzLoadBalancerBackendAddressPoolConfig -Name $lbPoolCfgName