Skip to content

Commit f6a2882

Browse files
praries880praries880
authored
Merge pull request #7113 from number213/preview-with-nrp-august
Merge NRP's August branch in preview
2 parents daa3775 + cd82507 commit f6a2882

File tree

224 files changed

+134900
-195149
lines changed

Some content is hidden

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

224 files changed

+134900
-195149
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
2828
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
2929
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
3131
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
3232
<PackageReference Include="Moq" Version="4.7.145" />
3333
</ItemGroup>
@@ -68,4 +68,4 @@
6868
</None>
6969
</ItemGroup>
7070

71-
</Project>
71+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.21.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
50+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Management.Storage, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5353
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="21.0.0" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="19.3.0-preview" targetFramework="net452" />
1011
<package id="Microsoft.Azure.Management.KeyVault" version="2.4.1-alpha" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="7.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
@@ -27,4 +27,4 @@
2727
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
2828
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
2929
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
30-
</packages>
30+
</packages>

‎src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="2.2.0-preview" />
28-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
28+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
2929
<PackageReference Include="Moq" Version="4.2.1510.2205" />
3030
</ItemGroup>
3131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
53+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
5454
</Reference>
5555
</ItemGroup>
5656
<ItemGroup>

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrud.json

Lines changed: 628 additions & 419 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkIds.json

Lines changed: 491 additions & 404 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkObjects.json

Lines changed: 609 additions & 400 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudRegistrationVirtualNetwork.json

Lines changed: 364 additions & 343 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudResolutionVirtualNetwork.json

Lines changed: 411 additions & 333 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Dns" version="2.2.0-preview" targetFramework="net452" />
9-
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Management.Network" version="19.3.0-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.0" />
2828
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.0" />
2929
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />
30-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
30+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.4.1\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
64+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
6565
</Reference>
6666
</ItemGroup>
6767
<ItemGroup>

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ public void TestCreateDeleteVaultWithPiping()
406406

407407
#endregion
408408

409-
[Fact]
409+
[Fact(Skip = "Fails in playback")]
410410
[Trait(Category.AcceptanceType, Category.CheckIn)]
411411
public void TestNetworkSet()
412412
{
@@ -480,4 +480,4 @@ private void DeleteAdServicePrincipal(KeyVaultManagementController controllerAdm
480480
}
481481

482482

483-
}
483+
}

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestNetworkSet.json

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

‎src/ResourceManager/KeyVault/Commands.KeyVault.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.KeyVault.WebKey" version="3.0.0" targetFramework="net452" />
99
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.KeyVault" version="2.4.1" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="19.3.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
28-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
28+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.3.0-preview" />
2929
<PackageReference Include="Microsoft.Azure.Insights" Version="0.15.0-preview" />
3030
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
3131
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="3.1.1-preview" />

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
47+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.3.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5050
<HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.18.0-preview\lib\net45\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
@@ -79,6 +79,7 @@
7979
<Compile Include="ScenarioTests\NetworkInterfaceTests.cs" />
8080
<Compile Include="ScenarioTests\LoadBalancerTests.cs" />
8181
<Compile Include="ScenarioTests\ExpressRouteCircuitTests.cs" />
82+
<Compile Include="ScenarioTests\PublicIpPrefixTests.cs" />
8283
<Compile Include="ScenarioTests\RouteTableTests.cs" />
8384
<Compile Include="ScenarioTests\NetworkSecurityGroupTests.cs" />
8485
<Compile Include="ScenarioTests\Generated\RouteTableTestsGenerated.cs" />
@@ -151,6 +152,9 @@
151152
<None Include="ScenarioTests\ExpressRouteCircuitTests.ps1">
152153
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
153154
</None>
155+
<None Include="ScenarioTests\PublicIpPrefixTests.ps1">
156+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
157+
</None>
154158
<None Include="ScenarioTests\RouteTableTests.ps1">
155159
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
156160
</None>
@@ -446,6 +450,15 @@
446450
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpStandardSku.json">
447451
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
448452
</None>
453+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpAddressTests\TestPublicIpAddressCRUDPublicIpPrefix.json">
454+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
455+
</None>
456+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpPrefixTests\TestPublicIpPrefixCRUD.json">
457+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
458+
</None>
459+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.PublicIpPrefixTests\TestPublicIpPrefixAllocatePublicIpAddress.json">
460+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
461+
</None>
449462
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.RouteTableTestsGenerated\TestRouteCRUDAllParameters.json">
450463
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
451464
</None>
@@ -578,6 +591,9 @@
578591
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkSubnetServiceEndpoint.json">
579592
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
580593
</None>
594+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkSubnetServiceEndpointPolicies.json">
595+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
596+
</None>
581597
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkUsage.json">
582598
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
583599
</None>
@@ -619,4 +635,4 @@
619635
</ItemGroup>
620636
<ItemGroup />
621637
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
622-
</Project>
638+
</Project>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ function Test-ApplicationGatewayCRUD2
387387
$gipconfig = New-AzureRmApplicationGatewayIPConfiguration -Name $gipconfigname -Subnet $gwSubnet
388388

389389
# frontend part
390+
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
390391
$pw01 = ConvertTo-SecureString "P@ssw0rd" -AsPlainText -Force
391392
$sslCert01Path = $basedir + "/ScenarioTests/Data/ApplicationGatewaySslCert1.pfx"
392393
$sslCert01 = New-AzureRmApplicationGatewaySslCertificate -Name $sslCert01Name -CertificateFile $sslCert01Path -Password $pw01
@@ -450,6 +451,7 @@ function Test-ApplicationGatewayCRUD2
450451
$getgw = Set-AzureRmApplicationGatewaySslCertificate -ApplicationGateway $getgw -Name $sslCert01Name -CertificateFile $sslCert01Path -Password $pw01
451452
Assert-NotNull $getgw.SslCertificates[0].Password
452453

454+
#[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
453455
$pw02 = ConvertTo-SecureString "P@ssw0rd" -AsPlainText -Force
454456
$sslCert02Path = $basedir + "/ScenarioTests/Data/ApplicationGatewaySslCert2.pfx"
455457
$getgw = Add-AzureRmApplicationGatewaySslCertificate -ApplicationGateway $getgw -Name $sslCert02Name -CertificateFile $sslCert02Path -Password $pw02
@@ -686,4 +688,4 @@ function Compare-AzureRmApplicationGateway($expected, $actual)
686688
Assert-AreEqual $expected.HttpListeners.Count $actual.HttpListeners.Count
687689
Assert-AreEqual $expected.RequestRoutingRules.Count $actual.RequestRoutingRules.Count
688690
Assert-AreEqual $expected.RedirectConfigurations.Count $actual.RedirectConfigurations.Count
689-
}
691+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void TestPacketCapture()
6969
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PacketCapture");
7070
}
7171

72-
[Fact(Skip = "Rerecord tests")]
72+
[Fact(Skip = "Skipped for due to playback mode failures.")]
7373
[Trait(Category.AcceptanceType, Category.CheckIn)]
7474
[Trait(Category.Owner, Category.netanalyticsdev)]
7575
public void TestTroubleshoot()

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ public void TestPublicIpAddressCRUD()
3737
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD");
3838
}
3939

40+
[Fact]
41+
[Trait(Category.AcceptanceType, Category.CheckIn)]
42+
[Trait(Category.Owner, Category.sdnnrp)]
43+
public void TestPublicIpAddressCRUDPublicIPPrefix()
44+
{
45+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-PublicIPPrefix");
46+
}
47+
4048
[Fact]
4149
[Trait(Category.AcceptanceType, Category.CheckIn)]
4250
[Trait(Category.Owner, Category.sdnnrp)]

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,3 +625,68 @@ function Test-PublicIpAddressZones
625625
Clean-ResourceGroup $rgname
626626
}
627627
}
628+
629+
<#
630+
.SYNOPSIS
631+
Tests creating new simple publicIpAddress from a PublicIPPrefix.
632+
#>
633+
function Test-PublicIpAddressCRUD-PublicIPPrefix
634+
{
635+
# Setup
636+
$rgname = Get-ResourceGroupName
637+
$rname = Get-ResourceName
638+
$domainNameLabel = Get-ResourceName
639+
$rglocation = Get-ProviderLocation ResourceManagement
640+
$resourceTypeParent = "Microsoft.Network/publicIpAddresses"
641+
$location = Get-ProviderLocation $resourceTypeParent
642+
643+
try
644+
{
645+
# Create the resource group
646+
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" }
647+
648+
# Create a PublicIPPrefix
649+
$prefixname = $rname + "prfx"
650+
$PublicIpPrefix = New-AzureRmPublicIpPrefix -ResourceGroupName $rgname -name $prefixname -location $location -Sku Standard -prefixLength 30
651+
$expectedPublicIpPrefix = Get-AzureRmPublicIpPrefix -ResourceGroupName $rgname -name $prefixname
652+
Assert-AreEqual $expectedPublicIpPrefix.ResourceGroupName $PublicIpPrefix.ResourceGroupName
653+
Assert-AreEqual $expectedPublicIpPrefix.Name $PublicIpPrefix.Name
654+
Assert-AreEqual $expectedPublicIpPrefix.Location $PublicIpPrefix.Location
655+
Assert-AreEqualObjectProperties $expectedPublicIpPrefix.Sku $PublicIpPrefix.Sku
656+
Assert-NotNull $expectedPublicIpPrefix.IPPrefix
657+
658+
# Create publicIpAddres
659+
$actual = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $rname -location $location -AllocationMethod Static -Sku Standard -DomainNameLabel $domainNameLabel -PublicIPPrefix $expectedPublicIpPrefix
660+
$expected = Get-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $rname
661+
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
662+
Assert-AreEqual $expected.Name $actual.Name
663+
Assert-AreEqual $expected.Location $actual.Location
664+
Assert-AreEqualObjectProperties $expected.Sku $actual.Sku
665+
Assert-AreEqual "Static" $expected.PublicIpAllocationMethod
666+
Assert-NotNull $expected.IpAddress
667+
Assert-AreEqual "Succeeded" $expected.ProvisioningState
668+
669+
# list
670+
$list = Get-AzureRmPublicIpAddress -ResourceGroupName $rgname
671+
Assert-AreEqual 1 @($list).Count
672+
Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
673+
Assert-AreEqual $list[0].Name $actual.Name
674+
Assert-AreEqual $list[0].Location $actual.Location
675+
Assert-AreEqualObjectProperties $list[0].Sku $actual.Sku
676+
Assert-AreEqual "Static" $list[0].PublicIpAllocationMethod
677+
Assert-NotNull $list[0].IpAddress
678+
Assert-AreEqual "Succeeded" $list[0].ProvisioningState
679+
680+
# delete
681+
$delete = Remove-AzureRmPublicIpAddress -ResourceGroupName $actual.ResourceGroupName -name $rname -PassThru -Force
682+
Assert-AreEqual true $delete
683+
684+
$list = Get-AzureRmPublicIpAddress -ResourceGroupName $actual.ResourceGroupName
685+
Assert-AreEqual 0 @($list).Count
686+
}
687+
finally
688+
{
689+
# Cleanup
690+
Clean-ResourceGroup $rgname
691+
}
692+
}

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
namespace Commands.Network.Test.ScenarioTests
16+
{
17+
using global::Commands.Network.Test;
18+
using Microsoft.Azure.ServiceManagemenet.Common.Models;
19+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
20+
using Xunit;
21+
using Xunit.Abstractions;
22+
23+
public class PublicIpPrefixTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
24+
{
25+
public XunitTracingInterceptor _logger;
26+
27+
public PublicIpPrefixTests(Xunit.Abstractions.ITestOutputHelper output)
28+
{
29+
_logger = new XunitTracingInterceptor(output);
30+
XunitTracingInterceptor.AddToContext(_logger);
31+
}
32+
33+
[Fact]
34+
[Trait(Category.AcceptanceType, Category.CheckIn)]
35+
[Trait(Category.Owner, Category.sdnnrp)]
36+
public void TestPublicIpPrefixCRUD()
37+
{
38+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpPrefixCRUD");
39+
}
40+
41+
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
43+
[Trait(Category.Owner, Category.sdnnrp)]
44+
public void TestPublicIpPrefixAllocatePublicIpAddress()
45+
{
46+
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpPrefixAllocatePublicIpAddress");
47+
}
48+
}
49+
}

0 commit comments

Comments
 (0)