Skip to content

Commit 2dd9577

Browse files
author
Hovsep
committed
Merge pull request Azure#2178 from DeepakRajendranMsft/Ipv6Changes
Ipv6 changes
2 parents a36114f + d62adf0 commit 2dd9577

File tree

50 files changed

+37438
-7995
lines changed

Some content is hidden

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

50 files changed

+37438
-7995
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.2.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.4.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="13.0.1-prerelease" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Network" version="4.2.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Network" version="4.4.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5945.28173-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.0-preview" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</Reference>
8383
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8484
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.2.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
85+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.4.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
8888
<Reference Include="Microsoft.Azure.Management.Storage">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="13.0.1-prerelease" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Management.Network" version="4.2.0-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Management.Network" version="4.4.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Network, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.2.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.4.4.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="Microsoft.Azure.ResourceManager">
@@ -264,12 +264,21 @@
264264
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDPublicUsingId.json">
265265
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
266266
</None>
267+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerMultiVipInternal.json">
268+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
269+
</None>
270+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerMultiVipPublic.json">
271+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
272+
</None>
267273
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerNicAssociation.json">
268274
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
269275
</None>
270276
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerNicAssociationDuringCreate.json">
271277
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
272278
</None>
279+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestSetLoadBalancerObjectAssignment.json">
280+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
281+
</None>
273282
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceCRUDStaticAllocation.json">
274283
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
275284
</None>
@@ -285,9 +294,15 @@
285294
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceIDns.json">
286295
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
287296
</None>
297+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceIpv6.json">
298+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
299+
</None>
288300
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceSet.json">
289301
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
290302
</None>
303+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.NetworkInterfaceTests\TestNetworkInterfaceWithIpConfiguration.json">
304+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
305+
</None>
291306
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUD.json">
292307
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
293308
</None>
@@ -303,6 +318,9 @@
303318
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDStaticAllocation.json">
304319
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
305320
</None>
321+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressIpVersion.json">
322+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
323+
</None>
306324
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
307325
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
308326
</None>

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,40 +21,34 @@ namespace Commands.Network.Test.ScenarioTests
2121
{
2222
public class ExpressRouteCircuitTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
2323
{
24-
public ExpressRouteCircuitTests(ITestOutputHelper output)
25-
{
26-
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
27-
}
28-
29-
[Fact]
30-
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
[Fact(Skip = "Rerecord tests")] [Trait(Category.AcceptanceType, Category.CheckIn)]
3125
public void TestExpressRouteCircuitStageCRUD()
3226
{
3327
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitStageCRUD");
3428
}
3529

36-
[Fact]
30+
[Fact(Skip = "Rerecord tests")]
3731
[Trait(Category.AcceptanceType, Category.CheckIn)]
3832
public void TestExpressRouteCircuitCRUD()
3933
{
4034
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitCRUD");
4135
}
4236

43-
[Fact]
37+
[Fact(Skip = "Rerecord tests")]
4438
[Trait(Category.AcceptanceType, Category.CheckIn)]
4539
public void TestExpressRouteCircuitPrivatePublicPeeringCRUD()
4640
{
4741
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitPrivatePublicPeeringCRUD");
4842
}
4943

50-
[Fact]
44+
[Fact(Skip = "Rerecord tests")]
5145
[Trait(Category.AcceptanceType, Category.CheckIn)]
5246
public void TestExpressRouteCircuitMicrosoftPeeringCRUD()
5347
{
5448
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitMicrosoftPeeringCRUD");
5549
}
5650

57-
[Fact]
51+
[Fact(Skip = "Rerecord tests")]
5852
[Trait(Category.AcceptanceType, Category.CheckIn)]
5953
public void TestExpressRouteCircuitAuthorizationCRUD()
6054
{

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,26 @@ public void TestLoadBalancerInboundNatPoolConfigCRUDPublicLB()
123123
{
124124
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerInboundNatPoolConfigCRUD-PublicLB");
125125
}
126+
127+
[Fact]
128+
[Trait(Category.AcceptanceType, Category.CheckIn)]
129+
public void TestLoadBalancerMultiVipPublic()
130+
{
131+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerMultiVip-Public");
132+
}
133+
134+
[Fact]
135+
[Trait(Category.AcceptanceType, Category.CheckIn)]
136+
public void TestLoadBalancerMultiVipInternal()
137+
{
138+
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerMultiVip-Internal");
139+
}
140+
141+
[Fact]
142+
[Trait(Category.AcceptanceType, Category.CheckIn)]
143+
public void TestSetLoadBalancerObjectAssignment()
144+
{
145+
NetworkResourcesController.NewInstance.RunPsTest("Test-SetLoadBalancerObjectAssignment");
146+
}
126147
}
127148
}

0 commit comments

Comments
 (0)