Skip to content

Commit 7efea26

Browse files
committed
Merging entire set of changes from PR 2958 plus the csproj update that broke the CI build
1 parent da57b59 commit 7efea26

File tree

7 files changed

+4708
-1639
lines changed

7 files changed

+4708
-1639
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,12 @@
398398
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineSingleNetworkInterface.json">
399399
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
400400
</None>
401-
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking.json" />
401+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking.json">
402+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
403+
</None>
404+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVMNicWithAcceleratedNetworkingValidations.json">
405+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
406+
</None>
402407
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineProfileTests\TestVirtualMachineProfileWithoutAUC.json">
403408
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
404409
</None>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ public void TestEffectiveRoutesAndNsg()
6060
ComputeTestController.NewInstance.RunPsTest("Test-EffectiveRoutesAndNsg");
6161
}
6262

63-
[Fact(Skip = "NRP not deployed")]
63+
[Fact]
6464
[Trait(Category.AcceptanceType, Category.CheckIn)]
6565
public void TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking()
6666
{
6767
ComputeTestController.NewInstance.RunPsTest("Test-SingleNetworkInterfaceWithAcceleratedNetworking");
6868
}
6969

70-
[Fact(Skip ="NRP not deployed")]
70+
[Fact]
7171
[Trait(Category.AcceptanceType, Category.CheckIn)]
7272
public void TestVMNicWithAcceleratedNetworkingValidations()
7373
{

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestVMNicWithAcceleratedNetworkingValidations.json

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

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests/TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking.json

Lines changed: 692 additions & 860 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void TestNetworkInterfaceWithIpConfiguration()
9696
NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceWithIpConfiguration");
9797
}
9898

99-
[Fact(Skip = "NRP not deployed")]
99+
[Fact]
100100
[Trait(Category.AcceptanceType, Category.CheckIn)]
101101
public void TestNetworkInterfaceWithAcceleratedNetworking()
102102
{

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/NetworkInterfaceTests.ps1

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ function Test-NetworkInterfaceCRUD
113113
try
114114
{
115115
# Create the resource group
116-
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
117116

118117
# Create the Virtual Network
119118
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
@@ -811,22 +810,21 @@ Tests creating new simple public networkinterface.
811810
#>
812811
function Test-NetworkInterfaceWithAcceleratedNetworking
813812
{
814-
# Setup
813+
# Setup
815814
$rgname = Get-ResourceGroupName
816815
$vnetName = Get-ResourceName
817816
$subnetName = Get-ResourceName
818817
$publicIpName = Get-ResourceName
819818
$nicName = Get-ResourceName
820819
$domainNameLabel = Get-ResourceName
821-
$rglocation = "WestCentralUS"
820+
$rglocation = "westcentralus"
822821
$resourceTypeParent = "Microsoft.Network/networkInterfaces"
823-
$location = "WestCentralUS"
822+
$location = "westcentralus"
824823

825824
try
826825
{
827826
# Create the resource group
828827
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
829-
830828
# Create the Virtual Network
831829
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
832830
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
@@ -835,11 +833,9 @@ function Test-NetworkInterfaceWithAcceleratedNetworking
835833
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
836834

837835
# Create NetworkInterface
838-
$actualNic = New-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname -Location $location -Subnet $vnet.Subnets[0] -PublicIpAddress $publicip -AcceleratedNetworkingEnabled
836+
$actualNic = New-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname -Location $location -Subnet $vnet.Subnets[0] -PublicIpAddress $publicip -EnableAcceleratedNetworking
839837
$expectedNic = Get-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname
840838

841-
$setNic = $actualNic | Set-AzureRmNetworkInterface
842-
843839
Assert-AreEqual $expectedNic.ResourceGroupName $actualNic.ResourceGroupName
844840
Assert-AreEqual $expectedNic.Name $actualNic.Name
845841
Assert-AreEqual $expectedNic.Location $actualNic.Location
@@ -849,8 +845,9 @@ function Test-NetworkInterfaceWithAcceleratedNetworking
849845
Assert-AreEqual $expectedNic.IpConfigurations[0].PublicIpAddress.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
850846
Assert-AreEqual $expectedNic.IpConfigurations[0].Subnet.Id $actualNic.IpConfigurations[0].Subnet.Id
851847
Assert-NotNull $expectedNic.IpConfigurations[0].PrivateIpAddress
848+
Assert-AreEqual $expectedNic.EnableAcceleratedNetworking $true
852849
Assert-AreEqual "Dynamic" $expectedNic.IpConfigurations[0].PrivateIpAllocationMethod
853-
Assert-AreEqual $expectedNic.AcceleratedNetworkingEnabled $true
850+
854851

855852
# Check publicIp address reference
856853
$publicip = Get-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName

0 commit comments

Comments
 (0)