Skip to content

Commit 10a4115

Browse files
yoavrubinyoavrubin
committed
Merge pull request #2 from markcowl/release-0.9.5
Release 0.9.5
2 parents ebf7ddb + aadc3c1 commit 10a4115

File tree

71 files changed

+12691
-724
lines changed

Some content is hidden

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

71 files changed

+12691
-724
lines changed

‎ChangeLog.txt‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,27 @@
8181
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
8282
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
8383
* Azure Backup cmdlets
84-
*Added New-AzureBackupVault cmdlets
85-
*Added Get-AzureBackupVault cmdlets
86-
*Added Set-AzureBackupVault cmdlets
87-
*Added Remove-AzureBackupVault cmdlets
88-
*Added Get-AzureBackupVaultCredential cmdlets
84+
*Added New-AzureBackupVault cmdlets
85+
*Added Get-AzureBackupVault cmdlets
86+
*Added Set-AzureBackupVault cmdlets
87+
*Added Remove-AzureBackupVault cmdlets
88+
*Added Get-AzureBackupVaultCredential cmdlets
8989
* Azure Resource Manager cmdlets
90-
* Fixed formatting of output for Get-UsageAggregates
91-
* Fixed executing Get-UsageAggregates when first cmdlet being called.
90+
* Fixed formatting of output for Get-UsageAggregates
91+
* Fixed executing Get-UsageAggregates when first cmdlet being called.
92+
* Added TrafficManager cmdlets
93+
* Enable-AzureTrafficManagerProfile
94+
* Disable-AzureTrafficManagerProfile
95+
* New-AzureTrafficManagerEndpoint
96+
* Get-AzureTrafficManagerEndpoint
97+
* Set-AzureTrafficManagerEndpoint
98+
* Remove-AzureTrafficManagerEndpoint
99+
* Enable-AzureTrafficManagerEndpoint
100+
* Disable-AzureTrafficManagerEndpoint
101+
* Upgraded TrafficManager cmdlets
102+
* Get-AzureTrafficManagerProfile
103+
* Name is now optional (it will list all profiles in resource group)
104+
* Resource group is now optional (it will list all profiles in subscription)
92105
* Azure Data Factory cmdlets
93106
* Upgraded management library to 1.0.0 with breaking JSON format change.
94107
* Updated list operation paging support in cmdlets.

‎src/ResourceManager.sln‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
4949
EndProject
5050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "ResourceManager\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}"
5151
EndProject
52-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.ResourceManagement.Automation.Test.csproj", "{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}"
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.ResourceManagement.Automation.Test.csproj", "{59D1B5DC-9175-43EC-90C6-CBA601B3565F}"
5353
EndProject
5454
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "ResourceManager\Websites\Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}"
5555
EndProject
@@ -63,6 +63,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "ResourceMan
6363
EndProject
6464
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}"
6565
EndProject
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2.Test", "ResourceManager\TrafficManager\Commands.TrafficManager2.Test\Commands.TrafficManager2.Test.csproj", "{5764A3A4-586C-4536-8481-13007CAC111B}"
67+
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2", "ResourceManager\TrafficManager\Commands.TrafficManager2\Commands.TrafficManager2.csproj", "{270CBB5F-BB8A-4E33-B35B-95698E607D97}"
69+
EndProject
6670
Global
6771
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6872
Debug|Any CPU = Debug|Any CPU
@@ -173,6 +177,14 @@ Global
173177
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.Build.0 = Debug|Any CPU
174178
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.ActiveCfg = Release|Any CPU
175179
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.Build.0 = Release|Any CPU
180+
{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
181+
{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.Build.0 = Debug|Any CPU
182+
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.ActiveCfg = Release|Any CPU
183+
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.Build.0 = Release|Any CPU
184+
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
185+
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
186+
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.ActiveCfg = Release|Any CPU
187+
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.Build.0 = Release|Any CPU
176188
EndGlobalSection
177189
GlobalSection(SolutionProperties) = preSolution
178190
HideSolutionNode = FALSE
@@ -188,9 +200,8 @@ Global
188200
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
189201
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
190202
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
191-
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
192203
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
193204
{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
194-
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
205+
{5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
195206
EndGlobalSection
196207
EndGlobal

‎src/ResourceManager/Automation/Commands.Automation.Test/Commands.ResourceManagement.Automation.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProductVersion>
77
</ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>{59D1B5DC-9175-43EC-90C6-CBA601B3565F}</ProjectGuid>
9+
<ProjectGuid>{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}</ProjectGuid>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
75-
<Private>True</Private>
74+
<SpecificVersion>False</SpecificVersion>
75+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7878
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<Private>True</Private>
8383
</Reference>
8484
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
86-
<Private>True</Private>
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
8787
</Reference>
8888
<Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8989
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>

‎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.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Management.Network" version="2.0.8-preview" targetFramework="net45" />
12+
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1515
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<SpecificVersion>False</SpecificVersion>
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.2.0.9-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -194,7 +194,8 @@
194194
</None>
195195
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ApplicationGatewayTests\TestApplicationGatewayCRUD.json">
196196
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
197-
</None> <None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
197+
</None>
198+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestCreateEmptyLoadBalancer.json">
198199
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
199200
</None>
200201
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.LoadBalancerTests\TestLoadBalancerCRUDInternalDynamic.json">
@@ -257,6 +258,9 @@
257258
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestEmptyRouteTable.json">
258259
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
259260
</None>
261+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteHopTypeTest.json">
262+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
263+
</None>
260264
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTests\TestRouteTableCRUD.json">
261265
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
262266
</None>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,11 @@ public void TestRouteTableRouteCRUD()
4747
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteTableRouteCRUD");
4848
}
4949

50+
[Fact]
51+
[Trait(Category.AcceptanceType, Category.CheckIn)]
52+
public void TestRouteHopTypeTest()
53+
{
54+
NetworkResourcesController.NewInstance.RunPsTest("Test-RouteHopTypeTest");
55+
}
5056
}
5157
}

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/RouteTableTests.ps1‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,64 @@ function Test-RouteTableRouteCRUD
313313
# Cleanup
314314
Clean-ResourceGroup $rgname
315315
}
316+
}
317+
318+
<#
319+
.SYNOPSIS
320+
Tests RouteTable Hoptype Test
321+
#>
322+
function Test-RouteHopTypeTest
323+
{
324+
# Setup
325+
$rgname = Get-ResourceGroupName
326+
$routeTableName = Get-ResourceName
327+
$vnetName = Get-ResourceName
328+
$subnetName = Get-ResourceName
329+
$domainNameLabel = Get-ResourceName
330+
$rglocation = Get-ProviderLocation ResourceManagement
331+
$resourceTypeParent = "Microsoft.Network/routeTables"
332+
$location = Get-ProviderLocation $resourceTypeParent
333+
334+
try
335+
{
336+
# Create the resource group
337+
$resourceGroup = New-AzureResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
338+
339+
$route1 = New-AzureRouteConfig -name "route1" -AddressPrefix "192.168.1.0/24" -NextHopIpAddress "23.108.1.1" -NextHopType "VirtualAppliance"
340+
$route2 = New-AzureRouteConfig -name "route2" -AddressPrefix "10.0.1.0/24" -NextHopType "VnetLocal"
341+
$route3 = New-AzureRouteConfig -name "route3" -AddressPrefix "0.0.0.0/0" -NextHopType "Internet"
342+
$route4 = New-AzureRouteConfig -name "route4" -AddressPrefix "10.0.2.0/24" -NextHopType "None"
343+
344+
# Create RouteTable
345+
$rt = New-AzureRouteTable -name $routeTableName -ResourceGroupName $rgname -Location $location -Route $route1, $route2, $route3, $route4
346+
347+
# Get RouteTable
348+
$getRT = Get-AzureRouteTable -name $routeTableName -ResourceGroupName $rgName
349+
350+
#verification
351+
Assert-AreEqual $rgName $getRT.ResourceGroupName
352+
Assert-AreEqual $routeTableName $getRT.Name
353+
Assert-NotNull $getRT.Etag
354+
Assert-AreEqual 4 @($getRT.Routes).Count
355+
Assert-AreEqual $getRT.Routes[0].Name "route1"
356+
Assert-AreEqual $getRT.Routes[0].NextHopType "VirtualAppliance"
357+
Assert-AreEqual $getRT.Routes[1].Name "route2"
358+
Assert-AreEqual $getRT.Routes[1].NextHopType "VnetLocal"
359+
Assert-AreEqual $getRT.Routes[2].Name "route3"
360+
Assert-AreEqual $getRT.Routes[2].NextHopType "Internet"
361+
Assert-AreEqual $getRT.Routes[3].Name "route4"
362+
Assert-AreEqual $getRT.Routes[3].NextHopType "None"
363+
364+
# Delete RouteTable
365+
$delete = Remove-AzureRouteTable -ResourceGroupName $rgname -name $routeTableName -PassThru -Force
366+
Assert-AreEqual true $delete
367+
368+
$list = Get-AzureRouteTable -ResourceGroupName $rgname
369+
Assert-AreEqual 0 @($list).Count
370+
}
371+
finally
372+
{
373+
# Cleanup
374+
Clean-ResourceGroup $rgname
375+
}
316376
}

0 commit comments

Comments
 (0)