Skip to content

Update Network SDK to use API version 2019-09-01 #10332

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.

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 10 commits into from
Oct 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.1-preview" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Compute/Compute.Test/Compute.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.1.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.1-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.1-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Dns/Dns.Test/Dns.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.1-preview" />
</ItemGroup>

</Project>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/KeyVault/KeyVault.Test/KeyVault.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.1-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NetAppFiles/NetAppFiles.Test/NetAppFiles.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.NetApp" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.1-preview" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function Test-VolumeCrud
# create the list of protocol types
$protocolTypes = New-Object string[] 2
$protocolTypes[0] = "NFSv3"
$protocolTypes[1] = "NFSv4"
$protocolTypes[1] = "NFSv4.1"

try
{
Expand Down Expand Up @@ -112,8 +112,8 @@ function Test-VolumeCrud
Assert-NotNull $retrievedVolume.ExportPolicy
Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[0].AllowedClients '0.0.0.0/0'
Assert-AreEqual $retrievedVolume.ExportPolicy.Rules[1].AllowedClients '1.2.3.0/24'
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] 'NFSv3'
Assert-AreEqual $retrievedVolume.ProtocolTypes[1] 'NFSv4.1'
Assert-AreEqual $retrievedVolume.ProtocolTypes[0] $protocolTypes[0]
Assert-AreEqual $retrievedVolume.ProtocolTypes[1] $protocolTypes[1]
Assert-NotNull $retrievedVolume.MountTargets

# create second volume and check using the confirm flag
Expand Down Expand Up @@ -298,4 +298,4 @@ function Test-VolumePipelines
# Cleanup
Clean-ResourceGroup $resourceGroup
}
}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Network/Network.Test/Network.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.16.1-preview" />
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.1.0" />
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />
Expand Down
4 changes: 3 additions & 1 deletion src/Network/Network.Test/NrpTeamAlias.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ class NrpTeamAlias
// Split into subsets due to tests' long running time
// Cortex and LocalNetworkGateway tests
public const string brooklynft = "brooklynft";
// VirtualNetworkGatewayConnection tests
// First part of VirtualNetworkGatewayConnection tests
public const string brooklynft_subset1 = "brooklynft_subset1";
// First half of VirtualNetworkGateway tests
public const string brooklynft_subset2 = "brooklynft_subset2";
// Second half of VirtualNetworkGateway tests
public const string brooklynft_subset3 = "brooklynft_subset3";
// Second part of VirtualNetworkGatewayConnection tests
public const string brooklynft_subset4 = "brooklynft_subset4";

// Azure Network Analytics Dev Team
public const string netanalyticsdev = "netanalyticsdev";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"newStorageAccountName": {
"defaultValue": "testvmssnrpacc",
"defaultValue": "[concat('testvmssnrpacc', substring(uniqueString(resourceGroup().id), 0, 4))]",
"type": "string"
},
"storageAccountDomain": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,5 @@ public void TestExpressRouteCircuitPeeringWithRouteFilter()
{
TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringWithRouteFilter");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
public void TestExpressRouteLocalCircuit()
{
TestRunner.RunTestScript("Test-ExpressRouteLocalCircuit");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ Tests ExpressRouteCircuitCRUD.
#>
function Test-ExpressRouteRouteFilters
{
$location = Get-ProviderLocation "Microsoft.Network/expressRouteCircuits" "West US"
$rgname = "filter"
$filterName = "filter"
$ruleName = "rule"
$rgname = Get-ResourceGroupName
$ruleName = Get-ResourceName
$filterName = Get-ResourceName
$location = Get-ProviderLocation "Microsoft.Network/routeFilters" "westcentralus"

try
{
Expand All @@ -54,7 +54,7 @@ function Test-ExpressRouteRouteFilters
Assert-AreEqual 0 @($filter.Rules).Count

$rule = New-AzRouteFilterRuleConfig -Name $ruleName -Access Allow -RouteFilterRuleType Community -CommunityList "12076:5010" -Force
$filter = Get-AzRouteFilter -Name filter -ResourceGroupName filter
$filter = Get-AzRouteFilter -Name $filterName -ResourceGroupName $rgname
$filter.Rules.Add($rule)
$job = Set-AzRouteFilter -RouteFilter $filter -Force -AsJob
$job | Wait-Job
Expand Down Expand Up @@ -287,30 +287,6 @@ function Test-ExpressRouteCircuitPrivatePublicPeeringCRUD
$listPeering = $circuit | Get-AzExpressRouteCircuitPeeringConfig
Assert-AreEqual 1 @($listPeering).Count

# add public peering
$circuit = Get-AzExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Add-AzExpressRouteCircuitPeeringConfig -Name AzurePublicPeering -PeeringType AzurePublicPeering -PeerASN 30 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 33 | Set-AzExpressRouteCircuit
$p = $circuit | Get-AzExpressRouteCircuitPeeringConfig -Name AzurePublicPeering
Assert-AreEqual "AzurePublicPeering" $p.Name
Assert-AreEqual "AzurePublicPeering" $p.PeeringType
Assert-AreEqual "30" $p.PeerASN
Assert-AreEqual "192.168.1.0/30" $p.PrimaryPeerAddressPrefix
Assert-AreEqual "192.168.2.0/30" $p.SecondaryPeerAddressPrefix
Assert-AreEqual "33" $p.VlanId

#set public peering
$circuit = Get-AzExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Set-AzExpressRouteCircuitPeeringConfig -Name AzurePublicPeering -PeeringType AzurePublicPeering -PeerASN 100 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 55 | Set-AzExpressRouteCircuit
$p = $circuit | Get-AzExpressRouteCircuitPeeringConfig -Name AzurePublicPeering

Assert-AreEqual "AzurePublicPeering" $p.Name
Assert-AreEqual "AzurePublicPeering" $p.PeeringType
Assert-AreEqual "100" $p.PeerASN
Assert-AreEqual "192.168.1.0/30" $p.PrimaryPeerAddressPrefix
Assert-AreEqual "192.168.2.0/30" $p.SecondaryPeerAddressPrefix
Assert-AreEqual "55" $p.VlanId

$listPeering = $circuit | Get-AzExpressRouteCircuitPeeringConfig
Assert-AreEqual 2 @($listPeering).Count

# Delete Circuit
$delete = Remove-AzExpressRouteCircuit -ResourceGroupName $rgname -name $circuitName -PassThru -Force
Assert-AreEqual true $delete
Expand Down Expand Up @@ -757,28 +733,3 @@ function Test-ExpressRouteCircuitPeeringWithRouteFilter
Clean-ResourceGroup $rgname
}
}

<#
.SYNOPSIS
Tests Local ExpressRouteCircuits. Ensures we can only create Local circuits on Direct ports.
#>
function Test-ExpressRouteLocalCircuit
{
# Setup
$rgname = Get-ResourceGroupName
$circuitName = Get-ResourceName
$rglocation = Get-ProviderLocation ResourceManagement
$location = Get-ProviderLocation "Microsoft.Network/expressRouteCircuits" "Brazil South"

try
{
# Create the resource group
$resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation
Assert-ThrowsContains { New-AzExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Local -SkuFamily MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 500 } "not allowed on"
}
finally
{
# Cleanup
Clean-ResourceGroup $rgname
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ function Test-ExpressRouteCircuitPeeringCRUDMinimalParameters
$rgname = Get-ResourceGroupName;
$rglocation = Get-ProviderLocation ResourceManagement;
$rname = "AzurePrivatePeering";
$rnameAdd = "AzurePublicPeering";
$location = Get-ProviderLocation "Microsoft.Network/expressRouteCircuits" "Brazil South";
# Resource's parameters
$PeeringType = "AzurePrivatePeering";
Expand All @@ -409,12 +408,6 @@ function Test-ExpressRouteCircuitPeeringCRUDMinimalParameters
$PrimaryPeerAddressPrefixSet = "11.0.0.0/30";
$SecondaryPeerAddressPrefixSet = "14.0.0.0/30";
$VlanIdSet = 2;
# Resource's parameters for Add test
$PeeringTypeAdd = "AzurePublicPeering";
$PeerASNAdd = 3;
$PrimaryPeerAddressPrefixAdd = "12.0.0.0/30";
$SecondaryPeerAddressPrefixAdd = "16.0.0.0/30";
$VlanIdAdd = 3;
# Dependency parameters
$ExpressRouteCircuitSkuTier = "Standard";
$ExpressRouteCircuitSkuFamily = "MeteredData";
Expand Down Expand Up @@ -475,32 +468,7 @@ function Test-ExpressRouteCircuitPeeringCRUDMinimalParameters
$listExpressRouteCircuitPeering = Get-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit;
Assert-NotNull ($listExpressRouteCircuitPeering | Where-Object { $_.Name -eq $rname });

# Add ExpressRouteCircuitPeering
$vExpressRouteCircuit = Add-AzExpressRouteCircuitPeeringConfig -Name $rnameAdd -ExpressRouteCircuit $vExpressRouteCircuit -PeeringType $PeeringTypeAdd -PeerASN $PeerASNAdd -PrimaryPeerAddressPrefix $PrimaryPeerAddressPrefixAdd -SecondaryPeerAddressPrefix $SecondaryPeerAddressPrefixAdd -VlanId $VlanIdAdd;
Assert-NotNull $vExpressRouteCircuit;
$vExpressRouteCircuit = Set-AzExpressRouteCircuit -ExpressRouteCircuit $vExpressRouteCircuit;
Assert-NotNull $vExpressRouteCircuit;

# Get ExpressRouteCircuitPeering
$vExpressRouteCircuitPeering = Get-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rnameAdd;
Assert-NotNull $vExpressRouteCircuitPeering;
Assert-True { Check-CmdletReturnType "Get-AzExpressRouteCircuitPeeringConfig" $vExpressRouteCircuitPeering };
Assert-AreEqual $rnameAdd $vExpressRouteCircuitPeering.Name;
Assert-AreEqual $PeeringTypeAdd $vExpressRouteCircuitPeering.PeeringType;
Assert-AreEqual $PeerASNAdd $vExpressRouteCircuitPeering.PeerASN;
Assert-AreEqual $PrimaryPeerAddressPrefixAdd $vExpressRouteCircuitPeering.PrimaryPeerAddressPrefix;
Assert-AreEqual $SecondaryPeerAddressPrefixAdd $vExpressRouteCircuitPeering.SecondaryPeerAddressPrefix;
Assert-AreEqual $VlanIdAdd $vExpressRouteCircuitPeering.VlanId;

# Get all ExpressRouteCircuit's ExpressRouteCircuitPeerings
$listExpressRouteCircuitPeering = Get-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit;
Assert-NotNull ($listExpressRouteCircuitPeering | Where-Object { $_.Name -eq $rnameAdd });

# Try Add again
Assert-ThrowsContains { Add-AzExpressRouteCircuitPeeringConfig -Name $rnameAdd -ExpressRouteCircuit $vExpressRouteCircuit -PeeringType $PeeringTypeAdd -PeerASN $PeerASNAdd -PrimaryPeerAddressPrefix $PrimaryPeerAddressPrefixAdd -SecondaryPeerAddressPrefix $SecondaryPeerAddressPrefixAdd -VlanId $VlanIdAdd } "already exists";

# Remove ExpressRouteCircuitPeering
$vExpressRouteCircuit = Remove-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rnameAdd;
$vExpressRouteCircuit = Remove-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rname;
# Additional call to test handling of already deleted child resource
$vExpressRouteCircuit = Remove-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rname;
Expand Down Expand Up @@ -531,7 +499,6 @@ function Test-ExpressRouteCircuitPeeringCRUDAllParameters
$rgname = Get-ResourceGroupName;
$rglocation = Get-ProviderLocation ResourceManagement;
$rname = "AzurePrivatePeering";
$rnameAdd = "AzurePublicPeering";
$location = Get-ProviderLocation "Microsoft.Network/expressRouteCircuits" "Brazil South";
# Resource's parameters
$PeeringType = "AzurePrivatePeering";
Expand All @@ -549,14 +516,6 @@ function Test-ExpressRouteCircuitPeeringCRUDAllParameters
$VlanIdSet = 2;
$SharedKeySet = "testkey2";
$PeerAddressTypeSet = "IPv4";
# Resource's parameters for Add test
$PeeringTypeAdd = "AzurePublicPeering";
$PeerASNAdd = 3;
$PrimaryPeerAddressPrefixAdd = "12.0.0.0/30";
$SecondaryPeerAddressPrefixAdd = "16.0.0.0/30";
$VlanIdAdd = 3;
$SharedKeyAdd = "testkey3";
$PeerAddressTypeAdd = "IPv4";
# Dependency parameters
$ExpressRouteCircuitSkuTier = "Standard";
$ExpressRouteCircuitSkuFamily = "MeteredData";
Expand Down Expand Up @@ -617,32 +576,7 @@ function Test-ExpressRouteCircuitPeeringCRUDAllParameters
$listExpressRouteCircuitPeering = Get-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit;
Assert-NotNull ($listExpressRouteCircuitPeering | Where-Object { $_.Name -eq $rname });

# Add ExpressRouteCircuitPeering
$vExpressRouteCircuit = Add-AzExpressRouteCircuitPeeringConfig -Name $rnameAdd -ExpressRouteCircuit $vExpressRouteCircuit -PeeringType $PeeringTypeAdd -PeerASN $PeerASNAdd -PrimaryPeerAddressPrefix $PrimaryPeerAddressPrefixAdd -SecondaryPeerAddressPrefix $SecondaryPeerAddressPrefixAdd -VlanId $VlanIdAdd -SharedKey $SharedKeyAdd -PeerAddressType $PeerAddressTypeAdd;
Assert-NotNull $vExpressRouteCircuit;
$vExpressRouteCircuit = Set-AzExpressRouteCircuit -ExpressRouteCircuit $vExpressRouteCircuit;
Assert-NotNull $vExpressRouteCircuit;

# Get ExpressRouteCircuitPeering
$vExpressRouteCircuitPeering = Get-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rnameAdd;
Assert-NotNull $vExpressRouteCircuitPeering;
Assert-True { Check-CmdletReturnType "Get-AzExpressRouteCircuitPeeringConfig" $vExpressRouteCircuitPeering };
Assert-AreEqual $rnameAdd $vExpressRouteCircuitPeering.Name;
Assert-AreEqual $PeeringTypeAdd $vExpressRouteCircuitPeering.PeeringType;
Assert-AreEqual $PeerASNAdd $vExpressRouteCircuitPeering.PeerASN;
Assert-AreEqual $PrimaryPeerAddressPrefixAdd $vExpressRouteCircuitPeering.PrimaryPeerAddressPrefix;
Assert-AreEqual $SecondaryPeerAddressPrefixAdd $vExpressRouteCircuitPeering.SecondaryPeerAddressPrefix;
Assert-AreEqual $VlanIdAdd $vExpressRouteCircuitPeering.VlanId;

# Get all ExpressRouteCircuit's ExpressRouteCircuitPeerings
$listExpressRouteCircuitPeering = Get-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit;
Assert-NotNull ($listExpressRouteCircuitPeering | Where-Object { $_.Name -eq $rnameAdd });

# Try Add again
Assert-ThrowsContains { Add-AzExpressRouteCircuitPeeringConfig -Name $rnameAdd -ExpressRouteCircuit $vExpressRouteCircuit -PeeringType $PeeringTypeAdd -PeerASN $PeerASNAdd -PrimaryPeerAddressPrefix $PrimaryPeerAddressPrefixAdd -SecondaryPeerAddressPrefix $SecondaryPeerAddressPrefixAdd -VlanId $VlanIdAdd -SharedKey $SharedKeyAdd -PeerAddressType $PeerAddressTypeAdd } "already exists";

# Remove ExpressRouteCircuitPeering
$vExpressRouteCircuit = Remove-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rnameAdd;
$vExpressRouteCircuit = Remove-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rname;
# Additional call to test handling of already deleted child resource
$vExpressRouteCircuit = Remove-AzExpressRouteCircuitPeeringConfig -ExpressRouteCircuit $vExpressRouteCircuit -Name $rname;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void TestReachabilityReport()
TestRunner.RunTestScript("Test-ReachabilityReport");
}

[Fact]
[Fact(Skip = "API is no longer available to customers")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)]
public void TestProvidersList()
Expand Down
48 changes: 0 additions & 48 deletions src/Network/Network.Test/ScenarioTests/UsageTestsGenerated.cs

This file was deleted.

Loading