Skip to content

Commit 3bd6314

Browse files
authored
Merge pull request Azure#4506 from EvgenyAgafonchikov/PSSKuChanges
PS sku changes: LoadBalancer, PublicIpAddress
2 parents c81f385 + db57ae4 commit 3bd6314

File tree

280 files changed

+10638
-89
lines changed

Some content is hidden

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

280 files changed

+10638
-89
lines changed

src/ResourceManager/Network/ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
- Updated Set-AzureRmVirtualSubnetConfig: Added optional parameter -ServiceEndpoint
2525
* Added cmdlet to list endpoint services available in the location
2626
- Get-AzureRmVirtualNetworkAvailableEndpointService
27+
* Added support for SKU parameter to Public IP Addresses and Load Balancers
28+
- Updated New-AzureRMLoadBalancer: Added optional parameter -Sku
29+
- Updated New-AzureRMPublicIpAddress: Added optional parameter -Sku
30+
* Added support for DisableOutboundSNAT to Load Balancer Rules
31+
- Updated New-AzureRMLoadBalancerRuleConfig: Added optional parameter DisableOutboundSNAT
32+
- Updated Add-AzureRMLoadBalancerRuleConfig: Added optional parameter DisableOutboundSNAT
33+
- Updated Set-AzureRMLoadBalancerRuleConfig: Added optional parameter DisableOutboundSNAT
2734

2835
## Version 4.3.1
2936

src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@
6060
<SpecificVersion>False</SpecificVersion>
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.4.0-preview\lib\net452\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.Management.Authorization">
63+
<Reference Include="Microsoft.Azure.Management.Authorization, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
65+
<Private>True</Private>
6566
</Reference>
6667
<Reference Include="Microsoft.Azure.Management.Network, Version=14.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6768
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.14.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
@@ -285,6 +286,18 @@
285286
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteBgpServiceCommunitiesGet.json">
286287
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
287288
</None>
289+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDInternalBasicSku.json">
290+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
291+
</None>
292+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDInternalStandardSku.json">
293+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
294+
</None>
295+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDPublicBasicSku.json">
296+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
297+
</None>
298+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerCRUDPublicStandardSku.json">
299+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
300+
</None>
288301
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests\TestFlowLog.json">
289302
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
290303
</None>
@@ -426,6 +439,12 @@
426439
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressVmss.json">
427440
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
428441
</None>
442+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpBasicSku.json">
443+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
444+
</None>
445+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpStandardSku.json">
446+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
447+
</None>
429448
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
430449
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
431450
</None>

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/LoadBalancerTests.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,5 +144,33 @@ public void TestSetLoadBalancerObjectAssignment()
144144
{
145145
NetworkResourcesController.NewInstance.RunPsTest("Test-SetLoadBalancerObjectAssignment");
146146
}
147+
148+
[Fact]
149+
[Trait(Category.AcceptanceType, Category.CheckIn)]
150+
public void TestSetLoadBalancerCRUDPublicBasicSku()
151+
{
152+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-PublicBasicSku");
153+
}
154+
155+
[Fact]
156+
[Trait(Category.AcceptanceType, Category.CheckIn)]
157+
public void TestSetLoadBalancerCRUDInternalBasicSku()
158+
{
159+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-InternalBasicSku");
160+
}
161+
162+
[Fact]
163+
[Trait(Category.AcceptanceType, Category.CheckIn)]
164+
public void TestSetLoadBalancerCRUDPublicStandardSku()
165+
{
166+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-PublicStandardSku");
167+
}
168+
169+
[Fact]
170+
[Trait(Category.AcceptanceType, Category.CheckIn)]
171+
public void TestSetLoadBalancerCRUDInternalStandardSku()
172+
{
173+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-InternalStandardSku");
174+
}
147175
}
148176
}

0 commit comments

Comments
 (0)