Skip to content

Minor fixes and enable tests #2662

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
Jul 26, 2016
Merged

Minor fixes and enable tests #2662

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
4 changes: 2 additions & 2 deletions src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/LoadBalancerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public LoadBalancerTests(ITestOutputHelper output)
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
}

[Fact(Skip = "ClientRuntime upgrade - Please re-record")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestLoadBalancerCRUDPublic()
{
Expand Down Expand Up @@ -131,7 +131,7 @@ public void TestLoadBalancerMultiVipPublic()
NetworkResourcesController.NewInstance.RunPsTest("Test-LoadBalancerMultiVip-Public");
}

[Fact(Skip = "ClientRuntime upgrade - Please re-record")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestLoadBalancerMultiVipInternal()
{
Expand Down
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 @@ -82,7 +82,7 @@ public void TestNetworkInterfaceExpandResource()
NetworkResourcesController.NewInstance.RunPsTest("Test-NetworkInterfaceExpandResource");
}

[Fact(Skip ="ClientRuntime upgrade - Please re-record")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestNetworkInterfaceIpv6()
{
Expand Down
69 changes: 35 additions & 34 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 @@ -591,6 +591,7 @@ function Test-NetworkInterfaceIpv6
$rgname = Get-ResourceGroupName
$vnetName = Get-ResourceName
$subnetName = Get-ResourceName
$subnet2Name = Get-ResourceName
$publicIpName = Get-ResourceName
$nicName = Get-ResourceName
$ipconfigName = Get-ResourceName
Expand All @@ -606,7 +607,8 @@ function Test-NetworkInterfaceIpv6

# 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
$subnet2 = New-AzureRmVirtualNetworkSubnetConfig -Name $subnet2Name -AddressPrefix 10.0.2.0/24
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet,$subnet2

# Create the publicip
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
Expand Down Expand Up @@ -638,33 +640,33 @@ function Test-NetworkInterfaceIpv6
$nic = Get-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname | Add-AzureRmNetworkInterfaceIpConfig -Name $ipconfigName -PrivateIpAddressVersion ipv6 | Set-AzureRmNetworkInterface
Assert-AreEqual 2 @($nic.IpConfigurations).Count

Assert-AreEqual $expectedNic.IpConfigurations[0].Name $nic.IpConfigurations[1].Name
Assert-AreEqual $publicip.Id $nic.IpConfigurations[1].PublicIpAddress.Id
Assert-AreEqual $vnet.Subnets[0].Id $nic.IpConfigurations[1].Subnet.Id
Assert-NotNull $nic.IpConfigurations[1].PrivateIpAddress
Assert-AreEqual "Dynamic" $nic.IpConfigurations[1].PrivateIpAllocationMethod
Assert-AreEqual $nic.IpConfigurations[1].PrivateIpAddressVersion IPv4
Assert-AreEqual $expectedNic.IpConfigurations[0].Name $nic.IpConfigurations[0].Name
Assert-AreEqual $publicip.Id $nic.IpConfigurations[0].PublicIpAddress.Id
Assert-AreEqual $vnet.Subnets[0].Id $nic.IpConfigurations[0].Subnet.Id
Assert-NotNull $nic.IpConfigurations[0].PrivateIpAddress
Assert-AreEqual "Dynamic" $nic.IpConfigurations[0].PrivateIpAllocationMethod
Assert-AreEqual $nic.IpConfigurations[0].PrivateIpAddressVersion IPv4

Assert-AreEqual $ipconfigName $nic.IpConfigurations[0].Name
Assert-Null $nic.IpConfigurations[0].PublicIpAddress
Assert-Null $nic.IpConfigurations[0].Subnet
Assert-AreEqual $nic.IpConfigurations[0].PrivateIpAddressVersion IPv6
Assert-AreEqual $ipconfigName $nic.IpConfigurations[1].Name
Assert-Null $nic.IpConfigurations[1].PublicIpAddress
Assert-Null $nic.IpConfigurations[1].Subnet
Assert-AreEqual $nic.IpConfigurations[1].PrivateIpAddressVersion IPv6

# Set Ipconfig
$nic = Get-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname | Set-AzureRmNetworkInterfaceIpConfig -Name $nic.IpConfigurations[1].Name -PrivateIpAddressVersion ipv4 -Subnet $nic.IpConfigurations[1].Subnet | Set-AzureRmNetworkInterface
$nic = Get-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname | Set-AzureRmNetworkInterfaceIpConfig -Name $nic.IpConfigurations[0].Name -Subnet $vnet.Subnets[1] -PrivateIpAddress "10.0.2.10" | Set-AzureRmNetworkInterface
Assert-AreEqual 2 @($nic.IpConfigurations).Count

Assert-AreEqual $expectedNic.IpConfigurations[0].Name $nic.IpConfigurations[1].Name
Assert-Null $nic.IpConfigurations[1].PublicIpAddress
Assert-AreEqual $vnet.Subnets[0].Id $nic.IpConfigurations[1].Subnet.Id
Assert-NotNull $nic.IpConfigurations[1].PrivateIpAddress
Assert-AreEqual "Dynamic" $nic.IpConfigurations[1].PrivateIpAllocationMethod
Assert-AreEqual $nic.IpConfigurations[1].PrivateIpAddressVersion IPv4

Assert-AreEqual $ipconfigName $nic.IpConfigurations[0].Name
Assert-AreEqual $expectedNic.IpConfigurations[0].Name $nic.IpConfigurations[0].Name
Assert-Null $nic.IpConfigurations[0].PublicIpAddress
Assert-Null $nic.IpConfigurations[0].Subnet
Assert-AreEqual $nic.IpConfigurations[0].PrivateIpAddressVersion IPv6
Assert-AreEqual $vnet.Subnets[1].Id $nic.IpConfigurations[0].Subnet.Id
Assert-NotNull $nic.IpConfigurations[0].PrivateIpAddress
Assert-AreEqual "Static" $nic.IpConfigurations[0].PrivateIpAllocationMethod
Assert-AreEqual $nic.IpConfigurations[0].PrivateIpAddressVersion IPv4

Assert-AreEqual $ipconfigName $nic.IpConfigurations[1].Name
Assert-Null $nic.IpConfigurations[1].PublicIpAddress
Assert-Null $nic.IpConfigurations[1].Subnet
Assert-AreEqual $nic.IpConfigurations[1].PrivateIpAddressVersion IPv6

# Get IpConfig
$ipconfigv6 = Get-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname | Get-AzureRmNetworkInterfaceIpConfig -Name $ipconfigName
Expand All @@ -679,17 +681,16 @@ function Test-NetworkInterfaceIpv6

Assert-AreEqual 2 @($ipconfigList).Count

Assert-AreEqual $ipconfigList[1].Name $nic.IpConfigurations[1].Name
Assert-Null $ipconfigList[1].PublicIpAddress
Assert-AreEqual $vnet.Subnets[0].Id $ipconfigList[1].Subnet.Id
Assert-NotNull $ipconfigList[1].PrivateIpAddress
Assert-AreEqual "Dynamic" $ipconfigList[1].PrivateIpAllocationMethod
Assert-AreEqual $ipconfigList[1].PrivateIpAddressVersion IPv4
Assert-AreEqual $expectedNic.IpConfigurations[0].Name $ipconfigList[0].Name
Assert-Null $ipconfigList[0].PublicIpAddress.Id
Assert-NotNull $ipconfigList[0].PrivateIpAddress
Assert-AreEqual "Static" $nic.IpConfigurations[0].PrivateIpAllocationMethod
Assert-AreEqual $ipconfigList[0].PrivateIpAddressVersion IPv4

Assert-AreEqual $ipconfigList[0].Name $nic.IpConfigurations[0].Name
Assert-Null $ipconfigList[0].PublicIpAddress
Assert-Null $ipconfigList[0].Subnet
Assert-AreEqual $ipconfigList[0].PrivateIpAddressVersion IPv6
Assert-AreEqual $ipconfigName $ipconfigList[1].Name
Assert-Null $ipconfigList[1].PublicIpAddress
Assert-Null $ipconfigList[1].Subnet
Assert-AreEqual $ipconfigList[1].PrivateIpAddressVersion IPv6

# Remove IpConfig
$nic = Get-AzureRmNetworkInterface -Name $nicName -ResourceGroupName $rgname | Remove-AzureRmNetworkInterfaceIpConfig -Name $ipconfigName | Set-AzureRmNetworkInterface
Expand All @@ -698,9 +699,9 @@ function Test-NetworkInterfaceIpv6

Assert-AreEqual $expectedNic.IpConfigurations[0].Name $nic.IpConfigurations[0].Name
Assert-Null $nic.IpConfigurations[0].PublicIpAddress
Assert-AreEqual $vnet.Subnets[0].Id $nic.IpConfigurations[0].Subnet.Id
Assert-AreEqual $vnet.Subnets[1].Id $nic.IpConfigurations[0].Subnet.Id
Assert-NotNull $nic.IpConfigurations[0].PrivateIpAddress
Assert-AreEqual "Dynamic" $nic.IpConfigurations[0].PrivateIpAllocationMethod
Assert-AreEqual "Static" $nic.IpConfigurations[0].PrivateIpAllocationMethod
Assert-AreEqual $nic.IpConfigurations[0].PrivateIpAddressVersion IPv4

# Delete NetworkInterface
Expand Down
Loading