Skip to content

Commit 2a45514

Browse files
praries880praries880
authored
Merge pull request #6533 from joannakleong/preview
Azure Firewall Cmdlets
2 parents cbc05aa + 7f5d312 commit 2a45514

File tree

58 files changed

+34878
-49
lines changed

Some content is hidden

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

58 files changed

+34878
-49
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
3030
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
3131
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
32-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
32+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3333
<PackageReference Include="Moq" Version="4.7.145" />
3434
</ItemGroup>
3535

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.20.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
71-
</Reference>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
71+
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>
7474
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.3.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="20.0.0" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj

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

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3131
<PackageReference Include="Moq" Version="4.2.1510.2205" />
3232
</ItemGroup>
3333

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Dns/Commands.Dns.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Dns" version="2.2.0-preview" targetFramework="net452" />
9-
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.1.1-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

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

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

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3131
<PackageReference Include="Microsoft.Azure.Insights" Version="0.15.0-preview" />
3232
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
3333
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="3.1.1-preview" />

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.18.0-preview\lib\net45\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
@@ -97,7 +97,7 @@
9797
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
9898
</Reference>
9999
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.8\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
100+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.8.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103103
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -110,8 +110,8 @@
110110
</Reference>
111111
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
112112
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
113-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
114-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
113+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
115115
<Private>True</Private>
116116
</Reference>
117117
<Reference Include="Microsoft.Threading.Tasks">
@@ -183,6 +183,7 @@
183183
<Compile Include="ScenarioTests\NetworkInterfaceTests.cs" />
184184
<Compile Include="ScenarioTests\LoadBalancerTests.cs" />
185185
<Compile Include="ScenarioTests\ExpressRouteCircuitTests.cs" />
186+
<Compile Include="ScenarioTests\AzureFirewallTests.cs" />
186187
<Compile Include="ScenarioTests\RouteTableTests.cs" />
187188
<Compile Include="ScenarioTests\NetworkSecurityGroupTests.cs" />
188189
<Compile Include="ScenarioTests\RouteTableTestsGenerated.cs" />
@@ -252,6 +253,9 @@
252253
<None Include="ScenarioTests\ExpressRouteCircuitTests.ps1">
253254
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
254255
</None>
256+
<None Include="ScenarioTests\AzureFirewallTests.ps1">
257+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
258+
</None>
255259
<None Include="ScenarioTests\RouteTableTests.ps1">
256260
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
257261
</None>
@@ -323,6 +327,12 @@
323327
</None>
324328
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.AvailableEndpointServicesTests\TestAvailableEndpointServicesList.json">
325329
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
330+
</None>
331+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.AzureFirewallTests\TestAzureFirewallAllocateAndDeallocate.json">
332+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
333+
</None>
334+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.AzureFirewallTests\TestAzureFirewallCRUD.json">
335+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
326336
</None>
327337
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.DdosProtectionPlanTests\TestDdosProtectionPlanCollections.json">
328338
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -570,7 +580,7 @@
570580
</None>
571581
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkGatewayP2SAndSKU.json">
572582
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
573-
</None>
583+
</None>
574584
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkGatewayVpnDeviceConfigurationScripts.json">
575585
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
576586
</None>
@@ -633,7 +643,7 @@
633643
</None>
634644
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\VirtualNetworkGatewayVpnCustomIpsecPolicySetTest.json">
635645
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
636-
</None>
646+
</None>
637647
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestResourceNavigationLinksOnSubnetCRUD.json">
638648
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
639649
</None>

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/AzureFirewallTests.cs

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using Microsoft.Azure.ServiceManagemenet.Common.Models;
16+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
17+
using Xunit;
18+
using Xunit.Abstractions;
19+
20+
namespace Commands.Network.Test.ScenarioTests
21+
{
22+
public class AzureFirewallTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
23+
{
24+
public AzureFirewallTests(ITestOutputHelper output)
25+
{
26+
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
27+
}
28+
29+
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
public void TestAzureFirewallCRUD()
32+
{
33+
NetworkResourcesController.NewInstance.RunPsTest("Test-AzureFirewallCRUD");
34+
}
35+
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
public void TestAzureFirewallAllocateAndDeallocate()
39+
{
40+
NetworkResourcesController.NewInstance.RunPsTest("Test-AzureFirewallAllocateAndDeallocate");
41+
}
42+
}
43+
}

0 commit comments

Comments
 (0)