Skip to content

Commit 70a0463

Browse files
AzureRTAzureRT
committed
Merge pull request Azure#35 from DeepakRajendranMsft/NrpCrpCmdlet
Nrp crp cmdlet
2 parents 89c14e5 + a1fd29d commit 70a0463

File tree

38 files changed

+33534
-8780
lines changed

38 files changed

+33534
-8780
lines changed

‎AzurePowershell.Test.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<CommonTestDebug>.\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
1010
<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
1111
<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
12+
<NetworkResourceProviderTestDebug>.\src\ResourceManager\Network\Commands.NetworkResourceProvider.Test\bin\Debug\Commands.NetworkResourceProvider.Test.dll</NetworkResourceProviderTestDebug>
1213
<AzureRTTestSettings>.\src\AzureRT.testsettings</AzureRTTestSettings>
1314
<AzureRTTestContainer>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</AzureRTTestContainer>
1415
<StorageScenarioTestDebug>src\ServiceManagement\Storage\Commands.Storage.ScenarioTest\bin\Debug\CLITest.dll</StorageScenarioTestDebug>
@@ -43,6 +44,7 @@
4344
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
4445
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
4546
<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
47+
<XUnitTests Include=".\src\ResourceManager\Network\Commands.NetworkResourceProvider.Test\bin\Debug\Commands.NetworkResourceProvider.Test.dll"/>
4648
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
4749
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
4850
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
@@ -112,6 +114,11 @@
112114
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
113115
</Target>
114116

117+
<Target Name="NetworkResourceProviderTestDebug">
118+
<Xunit.Runner.MSBuild.xunit Assemblies="$(NetworkResourceProviderTestDebug)" Html="$(TestOutputDirectory)\NetworkResourceProviderTestDebug.xunit.dll.html" Verbose="false"
119+
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
120+
</Target>
121+
115122
<Target Name="TestBatch">
116123
<Xunit.Runner.MSBuild.xunit Assemblies="$(BatchTestDebug)" Html="$(TestOutputDirectory)\BatchTestDebug.xunit.dll.html" Verbose="false"
117124
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />

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

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
<Compile Include="NetworkResourcesController.cs" />
142142
<Compile Include="ScenarioTests\NetworkInterfaceTests.cs" />
143143
<Compile Include="ScenarioTests\LoadBalancerTests.cs" />
144+
<Compile Include="ScenarioTests\NetworkSecurityGroupTests.cs" />
144145
<Compile Include="ScenarioTests\VirtualNetworkTests.cs" />
145146
<Compile Include="ScenarioTests\PublicIpAddressTests.cs" />
146147
</ItemGroup>
@@ -158,21 +159,57 @@
158159
<None Include="ScenarioTests\LoadBalancerTests.ps1">
159160
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
160161
</None>
162+
<None Include="ScenarioTests\NetworkSecurityGroupTests.ps1">
163+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
164+
</None>
161165
<None Include="ScenarioTests\VirtualNetworkTests.ps1">
162166
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
163167
</None>
164168
<None Include="ScenarioTests\PublicIpAddressTests.ps1">
165169
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
166170
</None>
171+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalDynamic.json">
172+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
173+
</None>
174+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalStatic.json">
175+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
176+
</None>
177+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalUsingId.json">
178+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
179+
</None>
180+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDPublic.json">
181+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
182+
</None>
183+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDPublicNoInboundNATRule.json">
184+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
185+
</None>
186+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDPublicPublicNoLbRule.json">
187+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
188+
</None>
189+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDPublicUsingId.json">
190+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
191+
</None>
167192
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceCRUDStaticAllocation.json">
168193
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
169194
</None>
195+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceCRUDUsingId.json">
196+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
197+
</None>
170198
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceSet.json">
171199
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
172200
</None>
173201
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUD.json">
174202
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
175203
</None>
204+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDEditDomainNameLavel.json">
205+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
206+
</None>
207+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDNoDomainNameLabel.json">
208+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
209+
</None>
210+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDStaticAllocation.json">
211+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
212+
</None>
176213
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkCRUD.json">
177214
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
178215
</None>
@@ -188,13 +225,13 @@
188225
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerChildResource.json">
189226
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
190227
</None>
191-
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUD.json">
228+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerSet.json">
192229
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
193230
</None>
194-
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDUsingId.json">
231+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.NetworkSecurityGroupTests\TestNetworkSecurityGroupCRUD.json">
195232
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
196233
</None>
197-
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerSet.json">
234+
<None Include="SessionRecords\Commands.NetworkResourceProvider.Test.ScenarioTests.NetworkSecurityGroupTests\TestNetworkSecurityGroupSecurityRuleCRUD.json">
198235
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
199236
</None>
200237
</ItemGroup>
@@ -227,6 +264,7 @@
227264
<ItemGroup>
228265
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
229266
</ItemGroup>
267+
<ItemGroup />
230268
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
231269
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
232270
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Cleans the created resource groups
5050
#>
5151
function Clean-ResourceGroup($rgname)
5252
{
53-
if ([Microsoft.Azure.Utilities.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Utilities.HttpRecorder.HttpRecorderMode]::Playback) {
53+
if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback) {
5454
Remove-AzureResourceGroup -Name $rgname -Force
5555
}
5656
}

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

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,51 @@ public class LoadBalancerTests
2121
{
2222
[Fact]
2323
[Trait(Category.AcceptanceType, Category.CheckIn)]
24-
public void TestLoadBalancerCRUD()
24+
public void TestLoadBalancerCRUDPublic()
2525
{
26-
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD");
26+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-Public");
2727
}
2828

2929
[Fact]
3030
[Trait(Category.AcceptanceType, Category.CheckIn)]
31-
public void TestLoadBalancerCRUDUsingId()
31+
public void TestLoadBalancerCRUDInternalDynamic()
3232
{
33-
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUDUsingId");
33+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-InternalDynamic");
34+
}
35+
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
public void TestLoadBalancerCRUDInternalStatic()
39+
{
40+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-InternalStatic");
41+
}
42+
43+
[Fact]
44+
[Trait(Category.AcceptanceType, Category.CheckIn)]
45+
public void TestLoadBalancerCRUDPublicNoInboundNATRule()
46+
{
47+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-PublicNoInboundNATRule");
48+
}
49+
50+
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
52+
public void TestLoadBalancerCRUDPublicPublicNoLbRule()
53+
{
54+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-PublicNoLbRule");
55+
}
56+
57+
[Fact]
58+
[Trait(Category.AcceptanceType, Category.CheckIn)]
59+
public void TestLoadBalancerCRUDInternalUsingId()
60+
{
61+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-InternalUsingId");
62+
}
63+
64+
[Fact]
65+
[Trait(Category.AcceptanceType, Category.CheckIn)]
66+
public void TestLoadBalancerCRUDPublicUsingId()
67+
{
68+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerCRUD-PublicUsingId");
3469
}
3570

3671
[Fact]

0 commit comments

Comments
 (0)