Skip to content

Commit e728242

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#110 from DeepakRajendranMsft/NicLbChanges
Nic lb changes
2 parents 475ebc2 + 4f31e18 commit e728242

File tree

81 files changed

+20976
-11776
lines changed

Some content is hidden

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

81 files changed

+20976
-11776
lines changed

‎ChangeLog.txt

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,62 @@
1-
2015.04.28 version 0.8.17
1+
2015.05.17 version 0.8.18
2+
* Azure Network
3+
* Added Cmdlets
4+
* Get-AzureVirtualNetwork
5+
* New-AzureVirtualNetwork
6+
* Remove-AzureVirtualNetwork
7+
* Set-AzureVirtualNetwork
8+
* Get-AzureVirtualNetworkSubnetConfig
9+
* New-AzureVirtualNetworkSubnetConfig
10+
* Add-AzureVirtualNetworkSubnetConfig
11+
* Set-AzureVirtualNetworkSubnetConfig
12+
* Remove-AzureVirtualNetworkSubnetConfig
13+
* Get-AzureNetworkInterface
14+
* New-AzureNetworkInterface
15+
* Remove-AzureNetworkInterface
16+
* Set-AzureNetworkInterface
17+
* Get-AzurePublicIpAddress
18+
* New-AzurePublicIpAddress
19+
* Remove-AzurePublicIpAddress
20+
* Set-AzurePublicIpAddress
21+
* Add-AzureLoadBalancerBackendAddressPoolConfig
22+
* Add-AzureLoadBalancerFrontendIpConfig
23+
* Add-AzureLoadBalancerInboundNatRuleConfig
24+
* Add-AzureLoadBalancerProbeConfig
25+
* Add-AzureLoadBalancerRuleConfig
26+
* Get-AzureLoadBalancer
27+
* Get-AzureLoadBalancerBackendAddressPoolConfig
28+
* Get-AzureLoadBalancerFrontendIpConfig
29+
* Get-AzureLoadBalancerInboundNatRuleConfig
30+
* Get-AzureLoadBalancerProbeConfig*
31+
* Get-AzureLoadBalancerRuleConfig
32+
* New-AzureLoadBalancer
33+
* New-AzureLoadBalancerBackendAddressPoolConfig
34+
* New-AzureLoadBalancerFrontendIpConfig
35+
* New-AzureLoadBalancerInboundNatRuleConfig
36+
* New-AzureLoadBalancerProbeConfig
37+
* New-AzureLoadBalancerRuleConfig
38+
* Remove-AzureLoadBalancer
39+
* Remove-AzureLoadBalancerBackendAddressPoolConfig
40+
* Remove-AzureLoadBalancerFrontendIpConfig
41+
* Remove-AzureLoadBalancerInboundNatRuleConfig
42+
* Remove-AzureLoadBalancerProbeConfig
43+
* Remove-AzureLoadBalancerRuleConfig
44+
* Set-AzureLoadBalancer
45+
* Set-AzureLoadBalancerFrontendIpConfig
46+
* Set-AzureLoadBalancerInboundNatRuleConfig
47+
* Set-AzureLoadBalancerProbeConfig
48+
* Set-AzureLoadBalancerRuleConfig
49+
* Get-AzureNetworkSecurityGroup
50+
* New-AzureNetworkSecurityGroup
51+
* Remove-AzureNetworkSecurityGroup
52+
* Set-AzureNetworkSecurityGroup
53+
* Get-AzureNetworkSecurityRuleConfig
54+
* New-AzureNetworkSecurityRuleConfig
55+
* Remove-AzureNetworkSecurityRuleConfig
56+
* Add-AzureNetworkSecurityRuleConfig
57+
* Set-AzureNetworkSecurityRuleConfig
58+
59+
2015.04.28 version 0.8.17
260
* Azure Batch
361
* Added cmdlets
462
* New-AzureBatchVMUser

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,13 @@
6868
<Reference Include="Microsoft.Azure.Management.Compute">
6969
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
7070
</Reference>
71+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<SpecificVersion>False</SpecificVersion>
73+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.0-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
74+
</Reference>
7175
<Reference Include="Microsoft.Azure.Management.Storage">
7276
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.1.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
7377
</Reference>
74-
<Reference Include="Microsoft.Azure.Management.Network">
75-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.1.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
76-
</Reference>
7778
<Reference Include="Microsoft.Azure.ResourceManager">
7879
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7980
</Reference>
@@ -242,6 +243,9 @@
242243
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineExtensionTests\TestVirtualMachineExtension.json">
243244
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
244245
</None>
246+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestSingleNetworkInterfaceDnsSettings.json">
247+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
248+
</None>
245249
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineMultipleNetworkInterface.json">
246250
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
247251
</None>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,12 @@ public void TestVirtualMachineMultipleNetworkInterface()
3232
{
3333
ComputeTestController.NewInstance.RunPsTest("Test-MultipleNetworkInterface");
3434
}
35+
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
public void TestSingleNetworkInterfaceDnsSettings()
39+
{
40+
ComputeTestController.NewInstance.RunPsTest("Test-SingleNetworkInterfaceDnsSettings");
41+
}
3542
}
3643
}

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.ps1

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,101 @@ function Test-SingleNetworkInterface
133133
}
134134
}
135135

136+
<#
137+
.SYNOPSIS
138+
Test Virtual Machines with a NetworkInterface with DnsSettings
139+
#>
140+
function Test-SingleNetworkInterfaceDnsSettings
141+
{
142+
# Setup
143+
$rgname = Get-ComputeTestResourceGroupName
144+
145+
try
146+
{
147+
# Common
148+
$loc = 'West US';
149+
New-AzureResourceGroup -Name $rgname -Location $loc;
150+
151+
# VM Profile & Hardware
152+
$vmsize = 'Standard_A2';
153+
$vmname = 'vm' + $rgname;
154+
$p = New-AzureVMConfig -VMName $vmname -VMSize $vmsize;
155+
Assert-AreEqual $p.HardwareProfile.VirtualMachineSize $vmsize;
156+
157+
# NRP
158+
$subnet = New-AzureVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
159+
$vnet = New-AzureVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -DnsServer "10.1.1.1" -Subnet $subnet;
160+
$vnet = Get-AzureVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
161+
$subnetId = $vnet.Subnets[0].Id;
162+
$pubip = New-AzurePublicIpAddress -Force -Name ('pubip' + $rgname) -ResourceGroupName $rgname -Location $loc -AllocationMethod Dynamic -DomainNameLabel ('pubip' + $rgname);
163+
$pubip = Get-AzurePublicIpAddress -Name ('pubip' + $rgname) -ResourceGroupName $rgname;
164+
$pubipId = $pubip.Id;
165+
$nic = New-AzureNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId -PublicIpAddressId $pubip.Id -DnsServer "10.0.1.5";
166+
$nic = Get-AzureNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
167+
$nicId = $nic.Id;
168+
169+
$p = Add-AzureVMNetworkInterface -VM $p -Id $nicId;
170+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces.Count 1;
171+
Assert-AreEqual $p.NetworkProfile.NetworkInterfaces[0].ReferenceUri $nicId;
172+
Assert-Null $p.NetworkProfile.NetworkInterfaces[0].Primary;
173+
174+
# Storage Account (SA)
175+
$stoname = 'sto' + $rgname;
176+
$stotype = 'Standard_GRS';
177+
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
178+
Retry-IfException { $global:stoaccount = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
179+
180+
$osDiskName = 'osDisk';
181+
$osDiskCaching = 'ReadWrite';
182+
$osDiskVhdUri = "https://$stoname.blob.core.windows.net/test/os.vhd";
183+
$dataDiskVhdUri1 = "https://$stoname.blob.core.windows.net/test/data1.vhd";
184+
$dataDiskVhdUri2 = "https://$stoname.blob.core.windows.net/test/data2.vhd";
185+
$dataDiskVhdUri3 = "https://$stoname.blob.core.windows.net/test/data3.vhd";
186+
187+
$p = Set-AzureVMOSDisk -VM $p -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching;
188+
189+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk1' -Caching 'ReadOnly' -DiskSizeInGB 10 -Lun 0 -VhdUri $dataDiskVhdUri1;
190+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk2' -Caching 'ReadOnly' -DiskSizeInGB 11 -Lun 1 -VhdUri $dataDiskVhdUri2;
191+
$p = Add-AzureVMDataDisk -VM $p -Name 'testDataDisk3' -Caching 'ReadOnly' -DiskSizeInGB 12 -Lun 2 -VhdUri $dataDiskVhdUri3;
192+
$p = Remove-AzureVMDataDisk -VM $p -Name 'testDataDisk3';
193+
194+
# OS & Image
195+
$user = "Foo12";
196+
$password = 'BaR@123' + $rgname;
197+
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
198+
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
199+
$computerName = 'test';
200+
$vhdContainer = "https://$stoname.blob.core.windows.net/test";
201+
$img = 'a699494373c04fc0bc8f2bb1389d6106__Windows-Server-2012-Datacenter-201503.01-en.us-127GB.vhd';
202+
203+
$p.StorageProfile.OSDisk = $null;
204+
$p = Set-AzureVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
205+
$p = Set-AzureVMSourceImage -VM $p -Name $img -DestinationVhdsContainer $vhdContainer;
206+
207+
# Virtual Machine
208+
# TODO: Still need to do retry for New-AzureVM for SA, even it's returned in Get-.
209+
New-AzureVM -ResourceGroupName $rgname -Location $loc -Name $vmname -VM $p;
210+
211+
# Get VM
212+
$vm1 = Get-AzureVM -Name $vmname -ResourceGroupName $rgname;
213+
214+
# Get NetworkInterface
215+
$getnic = Get-AzureNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
216+
Assert-AreEqual $vm1.NetworkProfile.NetworkInterfaces[0].ReferenceUri $getnic.Id;
217+
Assert-AreEqual $getnic.Primary true;
218+
Assert-NotNull $getnic.MacAddress;
219+
Assert-NotNull $getnic.DnsSettings.AppliedDnsServers;
220+
221+
# Remove
222+
Remove-AzureVM -Name $vmname -ResourceGroupName $rgname -Force;
223+
}
224+
finally
225+
{
226+
# Cleanup
227+
Clean-ResourceGroup $rgname
228+
}
229+
}
230+
136231
<#
137232
.SYNOPSIS
138233
Test Virtual Machines with multiple NetworkInterface

0 commit comments

Comments
 (0)