Skip to content

Merging entire set of changes from PR 2958 plus the update for CI break #2959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2016
Merged

Merging entire set of changes from PR 2958 plus the update for CI break #2959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,12 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineSingleNetworkInterface.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking.json" />
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVMNicWithAcceleratedNetworkingValidations.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineProfileTests\TestVirtualMachineProfileWithoutAUC.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
4 changes: 2 additions & 2 deletions ...anager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ public void TestEffectiveRoutesAndNsg()
ComputeTestController.NewInstance.RunPsTest("Test-EffectiveRoutesAndNsg");
}

[Fact(Skip = "NRP not deployed")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking()
{
ComputeTestController.NewInstance.RunPsTest("Test-SingleNetworkInterfaceWithAcceleratedNetworking");
}

[Fact(Skip ="NRP not deployed")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVMNicWithAcceleratedNetworkingValidations()
{
Expand Down
3,672 changes: 3,672 additions & 0 deletions ...ts.VirtualMachineNetworkInterfaceTests/TestVMNicWithAcceleratedNetworkingValidations.json
View file
Open in desktop

Large diffs are not rendered by default.

1,552 changes: 692 additions & 860 deletions ...workInterfaceTests/TestVirtualMachineSingleNetworkInterfaceWithAcceleratedNetworking.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/NetworkInterfaceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void TestNetworkInterfaceWithIpConfiguration()
NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceWithIpConfiguration");
}

[Fact(Skip = "NRP not deployed")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestNetworkInterfaceWithAcceleratedNetworking()
{
Expand Down
15 changes: 6 additions & 9 deletions src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/NetworkInterfaceTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ function Test-NetworkInterfaceCRUD
try
{
# Create the resource group
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }

# Create the Virtual Network
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
Expand Down Expand Up @@ -811,22 +810,21 @@ Tests creating new simple public networkinterface.
#>
function Test-NetworkInterfaceWithAcceleratedNetworking
{
# Setup
# Setup
$rgname = Get-ResourceGroupName
$vnetName = Get-ResourceName
$subnetName = Get-ResourceName
$publicIpName = Get-ResourceName
$nicName = Get-ResourceName
$domainNameLabel = Get-ResourceName
$rglocation = "WestCentralUS"
$rglocation = "westcentralus"
$resourceTypeParent = "Microsoft.Network/networkInterfaces"
$location = "WestCentralUS"
$location = "westcentralus"

try
{
# Create the resource group
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }

# Create the Virtual Network
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
Expand All @@ -835,11 +833,9 @@ function Test-NetworkInterfaceWithAcceleratedNetworking
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel

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

$setNic = $actualNic | Set-AzureRmNetworkInterface

Assert-AreEqual $expectedNic.ResourceGroupName $actualNic.ResourceGroupName
Assert-AreEqual $expectedNic.Name $actualNic.Name
Assert-AreEqual $expectedNic.Location $actualNic.Location
Expand All @@ -849,8 +845,9 @@ function Test-NetworkInterfaceWithAcceleratedNetworking
Assert-AreEqual $expectedNic.IpConfigurations[0].PublicIpAddress.Id $actualNic.IpConfigurations[0].PublicIpAddress.Id
Assert-AreEqual $expectedNic.IpConfigurations[0].Subnet.Id $actualNic.IpConfigurations[0].Subnet.Id
Assert-NotNull $expectedNic.IpConfigurations[0].PrivateIpAddress
Assert-AreEqual $expectedNic.EnableAcceleratedNetworking $true
Assert-AreEqual "Dynamic" $expectedNic.IpConfigurations[0].PrivateIpAllocationMethod
Assert-AreEqual $expectedNic.AcceleratedNetworkingEnabled $true


# Check publicIp address reference
$publicip = Get-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName
Expand Down
Loading