Skip to content

Commit 83da504

Browse files
anton-evseevanton-evseev
committed
Merge remote-tracking branch 'remotes/upstream/master' into urlrewrite
2 parents 392ed03 + 6df8123 commit 83da504

File tree

59 files changed

+7759
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+7759
-542
lines changed

‎src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.12.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.13.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Network/Network.Test/ScenarioTests/AvailablePrivateEndpointTypeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public AvailablePrivateEndpointTypeTests(Xunit.Abstractions.ITestOutputHelper ou
2525
{
2626
}
2727

28-
[Fact(Skip = "TODO: record")]
28+
[Fact]
2929
[Trait(Category.AcceptanceType, Category.CheckIn)]
3030
[Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
3131
public void TestAvailablePrivateEndpointTypeCRUD()

‎src/Network/Network.Test/ScenarioTests/AvailablePrivateEndpointTypeTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ function Test-AvailablePrivateEndpointTypeCRUD
3333
# Setup
3434
$rgname = Get-ResourceGroupName;
3535
$rglocation = Get-ProviderLocation ResourceManagement;
36-
$location = Get-ProviderLocation "Microsoft.Network/availablePrivateEndpointTypes" "eastus2euap";
36+
$location = Get-ProviderLocation "Microsoft.Network/availablePrivateEndpointTypes" "westus";
3737

3838
try
3939
{
4040
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation;
4141

42-
$vAvailablePrivateEndpointType = Get-AzAvailablePrivateEndpointType -Location eastus2euap;
42+
$vAvailablePrivateEndpointType = Get-AzAvailablePrivateEndpointType -Location $location;
4343
Assert-True { Check-CmdletReturnType "Get-AzAvailablePrivateEndpointType" $vAvailablePrivateEndpointType };
4444
Assert-NotNull $vAvailablePrivateEndpointType;
4545
}

‎src/Network/Network.Test/ScenarioTests/PrivateEndpointTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public PrivateEndpointTests(Xunit.Abstractions.ITestOutputHelper output)
2525
{
2626
}
2727

28-
[Fact(Skip = "TODO: record")]
28+
[Fact]
2929
[Trait(Category.AcceptanceType, Category.CheckIn)]
3030
[Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
3131
public void TestPrivateEndpointCRUD()

‎src/Network/Network.Test/ScenarioTests/PrivateEndpointTests.ps1

Lines changed: 66 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,57 +32,77 @@ function Test-PrivateEndpointCRUD
3232
{
3333
# Setup
3434
$rgname = Get-ResourceGroupName;
35-
$rglocation = Get-ProviderLocation ResourceManagement;
3635
$rname = Get-ResourceName;
37-
$vnetName = Get-ResourceName;
3836
$location = Get-ProviderLocation "Microsoft.Network/privateEndpoints" "eastus2euap";
3937
# Dependency parameters
40-
$SubnetName = "SubnetName";
41-
$SubnetAddressPrefix = "10.0.1.0/24";
38+
$vnetName = Get-ResourceName;
39+
$ilbFrontName = "LB-Frontend";
40+
$ilbBackendName = "LB-Backend";
41+
$ilbName = Get-ResourceName;
4242
$PrivateLinkServiceConnectionName = "PrivateLinkServiceConnectionName";
4343
$IpConfigurationName = "IpConfigurationName";
4444
$PrivateLinkServiceName = "PrivateLinkServiceName";
45+
$vnetPEName = "VNetPE";
4546

4647
try
4748
{
48-
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation;
49+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $location;
4950

5051
# Create Virtual networks
5152
$frontendSubnet = New-AzVirtualNetworkSubnetConfig -Name "frontendSubnet" -AddressPrefix "10.0.1.0/24";
5253
$backendSubnet = New-AzVirtualNetworkSubnetConfig -Name "backendSubnet" -AddressPrefix "10.0.2.0/24";
53-
$otherSubnet = New-AzVirtualNetworkSubnetConfig -Name "otherSubnet" -AddressPrefix "10.0.3.0/24";
54-
$vnet = New-AzVirtualNetwork -Name "vnet" -ResourceGroupName $rgname -Location $rglocation -AddressPrefix "10.0.0.0/16" -Subnet $frontendSubnet,$backendSubnet,$otherSubnet;
54+
$otherSubnet = New-AzVirtualNetworkSubnetConfig -Name "otherSubnet" -AddressPrefix "10.0.3.0/24" -PrivateLinkServiceNetworkPoliciesFlag "Disabled";
55+
$vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix "10.0.0.0/16" -Subnet $frontendSubnet,$backendSubnet,$otherSubnet;
5556

5657
# Create LoadBalancer
57-
$frontendIP = New-AzLoadBalancerFrontendIpConfig -Name "LB-Frontend" -PrivateIpAddress 10.0.1.5 -SubnetId $vnet.subnets[0].Id;
58-
$beaddresspool= New-AzLoadBalancerBackendAddressPoolConfig -Name "LB-backend";
59-
$LB = New-AzLoadBalancer -ResourceGroupName $rgname -Name "LB" -Location $rglocation -FrontendIpConfiguration $frontendIP -BackendAddressPool $beaddresspool;
60-
61-
# Create required dependencies for private link service
62-
$IpConfiguration = New-AzPrivateLinkServiceIpConfig -Name $IpConfigurationName -PrivateIpAddress 10.0.3.5 -Subnet $vnet.subnets[2];
63-
$LoadBalancerFrontendIpConfiguration = Get-AzLoadBalancerFrontendIpConfig -LoadBalancer $LB;
64-
58+
$frontendIP = New-AzLoadBalancerFrontendIpConfig -Name $ilbFrontName -PrivateIpAddress "10.0.1.5" -SubnetId $vnet.subnets[0].Id;
59+
$beaddresspool= New-AzLoadBalancerBackendAddressPoolConfig -Name $ilbBackendName;
60+
$job = New-AzLoadBalancer -ResourceGroupName $rgname -Name $ilbName -Location $location -FrontendIpConfiguration $frontendIP -BackendAddressPool $beaddresspool -Sku "Standard" -AsJob;
61+
$job | Wait-Job
62+
$ilbcreate = $job | Receive-Job
63+
64+
# Verfify if load balancer is created successfully
65+
Assert-NotNull $ilbcreate;
66+
Assert-AreEqual $ilbName $ilbcreate.Name;
67+
Assert-AreEqual $location $ilbcreate.Location;
68+
Assert-AreEqual "Succeeded" $ilbcreate.ProvisioningState
69+
6570
# Create PrivateLinkService
66-
$vPrivateLinkService = New-AzPrivateLinkService -ResourceGroupName $rgname -ServiceName $PrivateLinkServiceName -Location $location -IpConfiguration $IpConfiguration -LoadBalancerFrontendIpConfiguration $LoadBalancerFrontendIpConfiguration;
67-
68-
# Create required dependencies
69-
$PrivateLinkServiceConnection = New-AzPrivateLinkServiceConnection -Name $PrivateLinkServiceConnectionName -PrivateLinkServiceId $vPrivateLinkService.Id
71+
$IpConfiguration = New-AzPrivateLinkServiceIpConfig -Name $IpConfigurationName -PrivateIpAddress 10.0.3.5 -Subnet $vnet.subnets[2];
72+
$LoadBalancerFrontendIpConfiguration = Get-AzLoadBalancer -Name $ilbName | Get-AzLoadBalancerFrontendIpConfig;
73+
74+
$job = New-AzPrivateLinkService -ResourceGroupName $rgname -Name $PrivateLinkServiceName -Location $location -IpConfiguration $IpConfiguration -LoadBalancerFrontendIpConfiguration $LoadBalancerFrontendIpConfiguration -AsJob;
75+
$job | Wait-Job
76+
$plscreate = $job | Receive-Job
77+
$vPrivateLinkService = Get-AzPrivateLinkService -Name $PrivateLinkServiceName -ResourceGroupName $rgName
78+
79+
# Verfify if private link service is created successfully
80+
Assert-NotNull $vPrivateLinkService;
81+
Assert-AreEqual $PrivateLinkServiceName $vPrivateLinkService.Name;
82+
Assert-NotNull $vPrivateLinkService.IpConfigurations;
83+
Assert-True { $vPrivateLinkService.IpConfigurations.Length -gt 0 };
84+
Assert-AreEqual "Succeeded" $vPrivateLinkService.ProvisioningState
85+
86+
# Create virtual network for private endpoint
87+
$peSubnet = New-AzVirtualNetworkSubnetConfig -Name "peSubnet" -AddressPrefix "11.0.1.0/24" -PrivateEndpointNetworkPoliciesFlag "Disabled"
88+
$vnetPE = New-AzVirtualNetwork -Name $vnetPEName -ResourceGroupName $rgName -Location $location -AddressPrefix "11.0.0.0/16" -Subnet $peSubnet
7089

7190
# Create PrivateEndpoint
72-
$vPrivateEndpoint = New-AzPrivateEndpoint -ResourceGroupName $rgname -Name $rname -Location $location -Subnet $vnet.subnets[2] -PrivateLinkServiceConnection $PrivateLinkServiceConnection;
73-
Assert-NotNull $vPrivateEndpoint;
74-
Assert-True { Check-CmdletReturnType "New-AzPrivateEndpoint" $vPrivateEndpoint };
75-
Assert-NotNull $vPrivateEndpoint.Subnets;
76-
Assert-True { $vPrivateEndpoint.Subnets.Length -gt 0 };
77-
Assert-NotNull $vPrivateEndpoint.PrivateLinkServiceConnections;
78-
Assert-True { $vPrivateEndpoint.PrivateLinkServiceConnections.Length -gt 0 };
79-
Assert-AreEqual $rname $vPrivateEndpoint.Name;
91+
$PrivateLinkServiceConnection = New-AzPrivateLinkServiceConnection -Name $PrivateLinkServiceConnectionName -PrivateLinkServiceId $vPrivateLinkService.Id
8092

81-
# Get PrivateEndpoint
82-
$vPrivateEndpoint = Get-AzPrivateEndpoint -ResourceGroupName $rgname -Name $rname;
93+
$job = New-AzPrivateEndpoint -ResourceGroupName $rgname -Name $rname -Location $location -Subnet $vnetPE.subnets[0] -PrivateLinkServiceConnection $PrivateLinkServiceConnection -AsJob;
94+
$job | Wait-Job
95+
$pecreate = $job | Receive-Job
96+
97+
$vPrivateEndpoint = Get-AzPrivateEndpoint -Name $rname -ResourceGroupName $rgname
98+
99+
# Verification
83100
Assert-NotNull $vPrivateEndpoint;
84-
Assert-True { Check-CmdletReturnType "Get-AzPrivateEndpoint" $vPrivateEndpoint };
85101
Assert-AreEqual $rname $vPrivateEndpoint.Name;
102+
Assert-NotNull $vPrivateEndpoint.Subnet;
103+
Assert-NotNull $vPrivateEndpoint.NetworkInterfaces;
104+
Assert-True { $vPrivateEndpoint.NetworkInterfaces.Length -gt 0 };
105+
Assert-AreEqual "Succeeded" $vPrivateEndpoint.ProvisioningState;
86106

87107
# Get all PrivateEndpoints in resource group
88108
$listPrivateEndpoint = Get-AzPrivateEndpoint -ResourceGroupName $rgname;
@@ -108,10 +128,23 @@ function Test-PrivateEndpointCRUD
108128
$job = Remove-AzPrivateEndpoint -ResourceGroupName $rgname -Name $rname -PassThru -Force -AsJob;
109129
$job | Wait-Job;
110130
$removePrivateEndpoint = $job | Receive-Job;
111-
Assert-AreEqual $true $removePrivateEndpoint;
131+
Assert-AreEqual true $removePrivateEndpoint;
132+
133+
$list = Get-AzPrivateEndpoint -ResourceGroupName $rgname
134+
Assert-AreEqual 0 @($list).Count
135+
136+
#Start-Sleep -s 60
137+
138+
# Remove Private Link Service
139+
$job = Remove-AzPrivateLinkService -ResourceGroupName $rgname -Name $PrivateLinkServiceName -PassThru -Force -AsJob;
140+
$job | Wait-Job;
141+
$removePrivateLinkService = $job | Receive-Job;
142+
Assert-AreEqual true $removePrivateLinkService;
143+
144+
$list = Get-AzPrivateLinkService -ResourceGroupName $rgname
145+
Assert-AreEqual 0 @($list).Count
112146

113-
# Get PrivateEndpoint should fail
114-
Assert-ThrowsContains { Get-AzPrivateEndpoint -ResourceGroupName $rgname -Name $rname } "not found";
147+
#Start-Sleep -s 30
115148
}
116149
finally
117150
{

‎src/Network/Network.Test/ScenarioTests/PrivateLinkServiceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public PrivateLinkServiceTests(Xunit.Abstractions.ITestOutputHelper output)
2525
{
2626
}
2727

28-
[Fact (Skip = "Skipping until PR with PrivateLink updates merged")]
28+
[Fact]
2929
[Trait(Category.AcceptanceType, Category.CheckIn)]
3030
[Trait(Category.Owner, NrpTeamAlias.sdnnrp)]
3131
public void TestPrivateLinkServiceCRUD()

‎src/Network/Network.Test/ScenarioTests/PrivateLinkServiceTests.ps1

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,55 @@ function Test-PrivateLinkServiceCRUD
3232
{
3333
# Setup
3434
$rgname = Get-ResourceGroupName;
35-
$rglocation = "eastus2euap";
3635
$rname = Get-ResourceName;
3736
$location = Get-ProviderLocation "Microsoft.Network/privateLinkServices" "eastus2euap";
3837
# Dependency parameters
3938
$IpConfigurationName = "IpConfigurationName";
39+
$vnetName = Get-ResourceName;
40+
$ilbFrontName = "LB-Frontend";
41+
$ilbBackendName = "LB-Backend";
42+
$ilbName = Get-ResourceName;
4043

4144
try
4245
{
43-
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation;
46+
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $location;
4447

4548
# Create Virtual networks
4649
$frontendSubnet = New-AzVirtualNetworkSubnetConfig -Name "frontendSubnet" -AddressPrefix "10.0.1.0/24";
4750
$backendSubnet = New-AzVirtualNetworkSubnetConfig -Name "backendSubnet" -AddressPrefix "10.0.2.0/24";
48-
$otherSubnet = New-AzVirtualNetworkSubnetConfig -Name "otherSubnet" -AddressPrefix "10.0.3.0/24";
49-
$vnet = New-AzVirtualNetwork -Name "vnet" -ResourceGroupName $rgname -Location $location -AddressPrefix "10.0.0.0/16" -Subnet $frontendSubnet,$backendSubnet,$otherSubnet;
51+
$otherSubnet = New-AzVirtualNetworkSubnetConfig -Name "otherSubnet" -AddressPrefix "10.0.3.0/24" -PrivateLinkServiceNetworkPoliciesFlag "Disabled";
52+
$vnet = New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix "10.0.0.0/16" -Subnet $frontendSubnet,$backendSubnet,$otherSubnet;
5053

5154
# Create LoadBalancer
52-
$frontendIP = New-AzLoadBalancerFrontendIpConfig -Name "LB-Frontend" -PrivateIpAddress 10.0.1.5 -SubnetId $vnet.subnets[0].Id;
53-
$beaddresspool= New-AzLoadBalancerBackendAddressPoolConfig -Name "LB-backend";
54-
$LB = New-AzLoadBalancer -ResourceGroupName $rgname -Name "LB" -Location $location -FrontendIpConfiguration $frontendIP -BackendAddressPool $beaddresspool -Sku Standard;
55-
55+
$frontendIP = New-AzLoadBalancerFrontendIpConfig -Name $ilbFrontName -PrivateIpAddress "10.0.1.5" -SubnetId $vnet.subnets[0].Id;
56+
$beaddresspool= New-AzLoadBalancerBackendAddressPoolConfig -Name $ilbBackendName;
57+
$job = New-AzLoadBalancer -ResourceGroupName $rgname -Name $ilbName -Location $location -FrontendIpConfiguration $frontendIP -BackendAddressPool $beaddresspool -Sku "Standard" -AsJob;
58+
$job | Wait-Job
59+
$ilbcreate = $job | Receive-Job
60+
61+
# Verfify if load balancer is created successfully
62+
Assert-NotNull $ilbcreate;
63+
Assert-AreEqual $ilbName $ilbcreate.Name;
64+
Assert-AreEqual $location $ilbcreate.Location;
65+
Assert-AreEqual "Succeeded" $ilbcreate.ProvisioningState
66+
5667
# Create required dependencies
5768
$IpConfiguration = New-AzPrivateLinkServiceIpConfig -Name $IpConfigurationName -PrivateIpAddress 10.0.3.5 -Subnet $vnet.subnets[2];
58-
$LoadBalancerFrontendIpConfiguration = Get-AzLoadBalancerFrontendIpConfig -LoadBalancer $LB;
69+
$LoadBalancerFrontendIpConfiguration = Get-AzLoadBalancer -Name $ilbName | Get-AzLoadBalancerFrontendIpConfig
5970

6071
# Create PrivateLinkService
61-
$vPrivateLinkService = New-AzPrivateLinkService -ResourceGroupName $rgName -ServiceName $rname -Location $location -IpConfiguration $IpConfiguration -LoadBalancerFrontendIpConfiguration $LoadBalancerFrontendIpConfiguration;
72+
$job = New-AzPrivateLinkService -ResourceGroupName $rgName -Name $rname -Location $location -IpConfiguration $IpConfiguration -LoadBalancerFrontendIpConfiguration $LoadBalancerFrontendIpConfiguration -AsJob;
73+
$job | Wait-Job
74+
$plscreate = $job | Receive-Job
75+
76+
$vPrivateLinkService = Get-AzPrivateLinkService -Name $rname -ResourceGroupName $rgName
77+
78+
# Verification
6279
Assert-NotNull $vPrivateLinkService;
63-
Assert-True { Check-CmdletReturnType "New-AzPrivateLinkService" $vPrivateLinkService };
80+
Assert-AreEqual $rname $vPrivateLinkService.Name;
6481
Assert-NotNull $vPrivateLinkService.IpConfigurations;
6582
Assert-True { $vPrivateLinkService.IpConfigurations.Length -gt 0 };
66-
Assert-AreEqual $rname $vPrivateLinkService.Name;
67-
68-
# Get PrivateLinkService
69-
$vPrivateLinkService = Get-AzPrivateLinkService -ResourceGroupName $rgname -Name $rname;
70-
Assert-NotNull $vPrivateLinkService;
71-
Assert-True { Check-CmdletReturnType "Get-AzPrivateLinkService" $vPrivateLinkService };
72-
Assert-AreEqual $rname $vPrivateLinkService.Name;
83+
Assert-AreEqual "Succeeded" $vPrivateLinkService.ProvisioningState
7384

7485
# Get all PrivateLinkServices in resource group
7586
$listPrivateLinkService = Get-AzPrivateLinkService -ResourceGroupName $rgname;
@@ -92,18 +103,18 @@ function Test-PrivateLinkServiceCRUD
92103
Assert-NotNull ($listPrivateLinkService | Where-Object { $_.ResourceGroupName -eq $rgname -and $_.Name -eq $rname });
93104

94105
# Remove PrivateLinkService
95-
$job = Remove-AzPrivateLinkService -ResourceGroupName $rgname -ServiceName $rname -PassThru -Force -AsJob;
106+
$job = Remove-AzPrivateLinkService -ResourceGroupName $rgname -Name $rname -PassThru -Force -AsJob;
96107
$job | Wait-Job;
97108
$removePrivateLinkService = $job | Receive-Job;
98-
Assert-AreEqual $true $removePrivateLinkService;
109+
Assert-AreEqual true $removePrivateLinkService;
99110

100-
# Get PrivateLinkService should fail
101-
Assert-ThrowsLike { Get-AzPrivateLinkService -ResourceGroupName $rgname -Name $rname } "*not*found*";
111+
$list = Get-AzPrivateLinkService -ResourceGroupName $rgname
112+
Assert-AreEqual 0 @($list).Count
102113
}
103114
finally
104115
{
105116
# Cleanup
106117
Clean-ResourceGroup $rgname;
107118
}
108-
}
119+
}
109120

‎src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.AvailablePrivateEndpointTypeTests/TestAvailablePrivateEndpointTypeCRUD.json

Lines changed: 481 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PrivateEndpointTests/TestPrivateEndpointCRUD.json

Lines changed: 3681 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.PrivateLinkServiceTests/TestPrivateLinkServiceCRUD.json

Lines changed: 1259 additions & 320 deletions
Large diffs are not rendered by default.

‎src/Network/Network/AvailablePrivateEndpointType/GetAzureAvailablePrivateEndpointTypeCommand.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
using Microsoft.Azure.Commands.Network.Models;
2020
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
2121
using Microsoft.Azure.Management.Network;
22+
using Microsoft.Azure.Management.Network.Models;
23+
using Microsoft.Rest.Azure;
2224
using CNM = Microsoft.Azure.Commands.Network.Models;
2325

2426
namespace Microsoft.Azure.Commands.Network
2527
{
2628
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "AvailablePrivateEndpointType"), OutputType(typeof(PSAvailablePrivateEndpointType))]
27-
public class GetAzureAvailablePrivateEndpointTypeCommand : NetworkBaseCmdlet
29+
public class GetAzureAvailablePrivateEndpointTypeCommand : PrivateEndpointBaseCmdlet
2830
{
2931
[Parameter(
3032
Mandatory = true,
@@ -34,11 +36,29 @@ public class GetAzureAvailablePrivateEndpointTypeCommand : NetworkBaseCmdlet
3436
[ValidateNotNullOrEmpty]
3537
public string Location { get; set; }
3638

39+
[Parameter(
40+
Mandatory = false,
41+
ValueFromPipelineByPropertyName = true,
42+
HelpMessage = "The resource group name.")]
43+
[ResourceGroupCompleter]
44+
[ValidateNotNullOrEmpty]
45+
[SupportsWildcards]
46+
public string ResourceGroupName { get; set; }
47+
3748
public override void Execute()
3849
{
3950
base.Execute();
4051

41-
var availablePrivateEndpointList = this.NetworkClient.NetworkManagementClient.AvailablePrivateEndpointTypes.List(Location);
52+
IPage<AvailablePrivateEndpointType> availablePrivateEndpointList = null;
53+
if (!string.IsNullOrEmpty(ResourceGroupName))
54+
{
55+
availablePrivateEndpointList = this.NetworkClient.NetworkManagementClient.AvailablePrivateEndpointTypes.ListByResourceGroup(this.Location, this.ResourceGroupName);
56+
}
57+
else
58+
{
59+
availablePrivateEndpointList = this.NetworkClient.NetworkManagementClient.AvailablePrivateEndpointTypes.List(Location);
60+
}
61+
4262
List<PSAvailablePrivateEndpointType> psPrivateEndpoints = new List<PSAvailablePrivateEndpointType>();
4363
foreach (var availablePrivateEndpoint in availablePrivateEndpointList)
4464
{

‎src/Network/Network/Az.Network.psd1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,15 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
401401
'Remove-AzPrivateEndpoint', 'New-AzPrivateLinkServiceConnection',
402402
'New-AzPrivateLinkService', 'Get-AzPrivateLinkService',
403403
'Remove-AzPrivateLinkService', 'New-AzPrivateLinkServiceIpConfig',
404+
'Set-AzPrivateEndpoint',
405+
'Set-AzPrivateLinkService',
404406
'Set-AzPrivateEndpointConnection',
407+
'Get-AzPrivateEndpointConnection',
408+
'Remove-AzPrivateEndpointConnection',
409+
'Get-AzAutoApprovedPrivateLinkService',
410+
'Test-AzPrivateLinkServiceVisibility',
411+
'Approve-AzPrivateEndpointConnection',
412+
'Deny-AzPrivateEndpointConnection',
405413
'Get-AzAvailablePrivateEndpointType'
406414

407415
# Variables to export from this module

0 commit comments

Comments
 (0)