Skip to content

Commit db806ae

Browse files
committed
Merge pull request Azure#1400 from dihan0604/dev
Authorization and Stats API
2 parents 1c58d60 + 2e5a292 commit db806ae

27 files changed

+1787
-10
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.0.2-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.0.3-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.ResourceManager">
@@ -219,6 +219,9 @@
219219
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ApplicationGatewayTests\TestApplicationGatewayCRUD.json">
220220
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
221221
</None>
222+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitAuthorizationCRUD.json">
223+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
224+
</None>
222225
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitCRUD.json">
223226
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
224227
</None>

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

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

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

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,74 @@ function Test-ExpressRouteCircuitPeeringCRUD
191191
# Cleanup
192192
Clean-ResourceGroup $rgname
193193
}
194-
}
194+
}
195+
196+
<#
197+
.SYNOPSIS
198+
Tests ExpressRouteCircuitAuthorizationCRUD.
199+
#>
200+
function Test-ExpressRouteCircuitAuthorizationCRUD
201+
{
202+
# Setup
203+
$rgname = Get-ResourceGroupName
204+
$circuitName = Get-ResourceName
205+
$rglocation = Get-ProviderLocation ResourceManagement
206+
$resourceTypeParent = "Microsoft.Network/expressRouteCircuits"
207+
$location = Get-ProviderLocation $resourceTypeParent
208+
$location = "brazilSouth"
209+
$authorizationName = "testkey"
210+
211+
try
212+
{
213+
# Create the resource group
214+
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation
215+
216+
# Create the ExpressRouteCircuit with authorization
217+
$authorization = New-AzureRmExpressRouteCircuitAuthorization -Name $authorizationName
218+
$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Authorization $authorization
219+
220+
#verification
221+
Assert-AreEqual $rgName $circuit.ResourceGroupName
222+
Assert-AreEqual $circuitName $circuit.Name
223+
Assert-NotNull $circuit.Location
224+
Assert-NotNull $circuit.Etag
225+
Assert-AreEqual 1 @($circuit.Authorizations).Count
226+
Assert-AreEqual "Standard_MeteredData" $circuit.Sku.Name
227+
Assert-AreEqual "Standard" $circuit.Sku.Tier
228+
Assert-AreEqual "MeteredData" $circuit.Sku.Family
229+
Assert-AreEqual "equinix" $circuit.ServiceProviderProperties.ServiceProviderName
230+
Assert-AreEqual "Silicon Valley" $circuit.ServiceProviderProperties.PeeringLocation
231+
Assert-AreEqual "1000" $circuit.ServiceProviderProperties.BandwidthInMbps
232+
233+
# Verify the authorization
234+
Assert-AreEqual $authorizationName $circuit.Authorizations[0].Name
235+
236+
237+
# get authorization
238+
#$a = $circuit | Get-AzureRmExpressRouteCircuitAuthorization -Name $authorizationName
239+
#Assert-AreEqual $authorizationName $a.Name
240+
241+
# add a new authorization
242+
#$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Add-AzureRmExpressRouteCircuitAuthorization -Name "testkey2" | Set-AzureRmExpressRouteCircuit
243+
244+
#$a = $circuit | Get-AzureRmExpressRouteCircuitAuthorization -Name "testkey2"
245+
#Assert-AreEqual "testkey2" $a.Name
246+
247+
248+
#$listAuthorization = $circuit | Get-AzureRmExpressRouteCircuitAuthorization
249+
#Assert-AreEqual 2 @($listAuthorization).Count
250+
251+
# Delete Circuit
252+
$delete = Remove-AzureRmExpressRouteCircuit -ResourceGroupName $rgname -name $circuitName -PassThru -Force
253+
Assert-AreEqual true $delete
254+
255+
$list = Get-AzureRmExpressRouteCircuit -ResourceGroupName $rgname
256+
Assert-AreEqual 0 @($list).Count
257+
}
258+
finally
259+
{
260+
# Cleanup
261+
Clean-ResourceGroup $rgname
262+
}
263+
}
264+

0 commit comments

Comments
 (0)