Skip to content

Commit 906f429

Browse files
hyonholeehyonholee
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into release-4.2.0
2 parents 7f8c3f0 + ad54da7 commit 906f429

File tree

42 files changed

+43349
-8199
lines changed

Some content is hidden

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

42 files changed

+43349
-8199
lines changed

‎src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,19 @@ protected override void Dispose(bool disposing)
311311
protected override void BeginProcessing()
312312
{
313313
AzureSession.Instance.ClientFactory.RemoveHandler(typeof(RPRegistrationDelegatingHandler));
314-
AzureSession.Instance.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
315-
() => new ResourceManagementClient(
316-
DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
317-
AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager)),
318-
s => DebugMessages.Enqueue(s)));
314+
if (DefaultContext != null && DefaultContext.Subscription != null)
315+
{
316+
AzureSession.Instance.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
317+
() =>
318+
{
319+
var client = new ResourceManagementClient(
320+
DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
321+
AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager));
322+
client.SubscriptionId = DefaultContext.Subscription.Id;
323+
return client;
324+
},
325+
s => DebugMessages.Enqueue(s)));
326+
}
319327

320328
base.BeginProcessing();
321329
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<Reference Include="Microsoft.Azure.Management.Compute">
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.16.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.12.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
10-
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="12.0.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.16.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
8484
<Private>True</Private>
8585
</Reference>
86-
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
86+
<Reference Include="Microsoft.Azure.Management.Network, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.12.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
8888
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="Microsoft.Azure.Management.Storage">

‎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.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
12-
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.Management.Network" version="12.0.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
<Reference Include="Microsoft.Azure.Management.Authorization">
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<Reference Include="Microsoft.Azure.Management.Network, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.12.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="Microsoft.Azure.Management.ResourceManager">
@@ -301,6 +301,9 @@
301301
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ApplicationGatewayTests\TestApplicationGatewayCRUD.json">
302302
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
303303
</None>
304+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteRouteFilterCRUD.json">
305+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
306+
</None>
304307
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitAuthorizationCRUD.json">
305308
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
306309
</None>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,14 @@ public void TestExpressRouteBgpServiceCommunitiesGet()
6060
{
6161
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteBGPServiceCommunities");
6262
}
63+
64+
[Fact]
65+
[Trait(Category.AcceptanceType, Category.CheckIn)]
66+
public void TestExpressRouteRouteFilterCRUD()
67+
{
68+
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteRouteFilters");
69+
}
70+
71+
6372
}
6473
}

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

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,61 @@ function Test-ExpressRouteBGPServiceCommunities
2424
Assert-NotNull $communities[0].BgpCommunities
2525
Assert-AreEqual true $communities[0].BgpCommunities[0].IsAuthorizedToUse
2626
}
27+
28+
<#
29+
.SYNOPSIS
30+
Tests ExpressRouteCircuitCRUD.
31+
#>
32+
function Test-ExpressRouteRouteFilters
33+
{
34+
$rgname = "filter"
35+
$location = "westus"
36+
$filterName = "filter"
37+
$ruleName = "rule"
38+
39+
try
40+
{
41+
# Create the resource group
42+
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $location
43+
44+
# Create the route filter
45+
$filter = New-AzureRmRouteFilter -Name $filterName -ResourceGroupName $rgname -Location $location -Force
46+
47+
#verification
48+
Assert-AreEqual $rgName $filter.ResourceGroupName
49+
Assert-AreEqual $filterName $filter.Name
50+
Assert-NotNull $filter.Location
51+
Assert-AreEqual 0 @($filter.Rules).Count
52+
53+
$rule = New-AzureRmRouteFilterRuleConfig -Name $ruleName -Access Allow -RouteFilterRuleType Community -CommunityList "12076:5010" -Force
54+
$filter = Get-AzureRmRouteFilter -Name filter -ResourceGroupName filter
55+
$filter.Rules.Add($rule)
56+
$filter = Set-AzureRmRouteFilter -RouteFilter $filter -Force
57+
58+
#verification
59+
Assert-AreEqual $rgName $filter.ResourceGroupName
60+
Assert-AreEqual $filterName $filter.Name
61+
Assert-NotNull $filter.Location
62+
Assert-AreEqual 1 @($filter.Rules).Count
63+
64+
$filter = Get-AzureRmRouteFilter -Name $filterName -ResourceGroupName $rgname
65+
$filter.Rules.Clear()
66+
$filter = Set-AzureRmRouteFilter -RouteFilter $filter -Force
67+
68+
#verification
69+
Assert-AreEqual $rgName $filter.ResourceGroupName
70+
Assert-AreEqual $filterName $filter.Name
71+
Assert-NotNull $filter.Location
72+
Assert-AreEqual 0 @($filter.Rules).Count
73+
74+
}
75+
finally
76+
{
77+
# Cleanup
78+
Clean-ResourceGroup $rgname
79+
}
80+
}
81+
2782
<#
2883
.SYNOPSIS
2984
Tests ExpressRouteCircuitCRUD.
@@ -263,14 +318,16 @@ function Test-ExpressRouteCircuitMicrosoftPeeringCRUD
263318
$resourceTypeParent = "Microsoft.Network/expressRouteCircuits"
264319
$location = Get-ProviderLocation $resourceTypeParent
265320
$location = "brazilSouth"
321+
$filterName = "filter"
322+
$ruleName = "rule"
266323
try
267324
{
268325
# Create the resource group
269326
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation
270327
# Create the ExpressRouteCircuit with peering
271328
$peering = New-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 33 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 223 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC -LegacyMode $true
272-
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Premium -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Peering $peering
273-
329+
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Premium -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Peering $peering
330+
274331
#verification
275332
Assert-AreEqual $rgName $circuit.ResourceGroupName
276333
Assert-AreEqual $circuitName $circuit.Name
@@ -296,6 +353,15 @@ function Test-ExpressRouteCircuitMicrosoftPeeringCRUD
296353
Assert-AreEqual 2 @($circuit.Peerings[0].MicrosoftPeeringConfig.AdvertisedPublicPrefixes).Count
297354
Assert-NotNull $circuit.Peerings[0].MicrosoftPeeringConfig.AdvertisedPublicPrefixesState
298355

356+
# create route filter
357+
$rule = New-AzureRmRouteFilterRuleConfig -Name $ruleName -Access Allow -RouteFilterRuleType Community -CommunityList "12076:5010" -Force
358+
$filter = New-AzureRmRouteFilter -Name $filterName -ResourceGroupName $rgname -Location $location -Rule $rule -Force
359+
360+
# update circuit with filter
361+
$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname
362+
$circuit.Peerings[0].RouteFilter = $filter
363+
Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $circuit
364+
299365
# get peering
300366
$p = $circuit | Get-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering
301367
Assert-AreEqual "MicrosoftPeering" $p.Name

‎src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests/TestExpressRouteCircuitMicrosoftPeeringCRUD.json

Lines changed: 31968 additions & 8107 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)