Skip to content

Commit

Permalink
[ Azure CDN ] Renamed cmdlets for new AFD SKUs (#14805)
Browse files Browse the repository at this point in the history
* Change cmdlet naming for AFDX

* fixes to afd rules, remove originresponsetimeoutseconds from afd endpoint

* Change cmdlet naming in tests, update test records

* revert sln changes

* update change log

* update md files

* add exceptions for rule action and rule condition cmdlets

* change parameter to singular name, return only classic cdn profiles for AzCdn cmdlet

Co-authored-by: Jorin Mejia <jomejia@microsoft.com>
  • Loading branch information
Jorin Mejia and aijemoj authored Apr 25, 2021
1 parent ff166f4 commit f17baf7
Show file tree
Hide file tree
Showing 117 changed files with 4,905 additions and 2,904 deletions.
10 changes: 5 additions & 5 deletions src/Cdn/Cdn.Test/ScenarioTests/AfdCustomDomainTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ function Test-CreateAfdCustomDomain
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft AFD Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$customDomainName = getAssetName

$hostName = "$customDomainName.azfdtests.xyz"

$customDomain = New-AzAfdCustomDomain -ResourceGroupName $resourceGroupName -ProfileName $profileName -CustomDomainName $customDomainName -HostName $hostName
$customDomain = New-AzFrontDoorCdnCustomDomain -ResourceGroupName $resourceGroupName -ProfileName $profileName -CustomDomainName $customDomainName -HostName $hostName

Assert-AreEqual $customDomain.Name $customDomainName
Assert-AreEqual $customDomain.HostName $hostName
Expand All @@ -48,15 +48,15 @@ function Test-GetAfdCustomDomain
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft AFD Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$customDomainName = getAssetName

$hostName = "$customDomainName.azfdtests.xyz"

New-AzAfdCustomDomain -ResourceGroupName $resourceGroupName -ProfileName $profileName -CustomDomainName $customDomainName -HostName $hostName
New-AzFrontDoorCdnCustomDomain -ResourceGroupName $resourceGroupName -ProfileName $profileName -CustomDomainName $customDomainName -HostName $hostName

$customDomain = Get-AzAfdCustomDomain -ResourceGroupName $resourceGroupName -ProfileName $profileName -CustomDomainName $customDomainName
$customDomain = Get-AzFrontDoorCdnCustomDomain -ResourceGroupName $resourceGroupName -ProfileName $profileName -CustomDomainName $customDomainName

Assert-AreEqual $customDomain.Name $customDomainName
Assert-AreEqual $customDomain.HostName $hostName
Expand Down
28 changes: 12 additions & 16 deletions src/Cdn/Cdn.Test/ScenarioTests/AfdEndpointTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,17 @@ function Test-CreateAfdEndpoint
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
$createdProfile = New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
$createdProfile = New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

Assert-AreEqual $profileName $createdProfile.Name
Assert-AreEqual $profileSku $createdProfile.Sku
Assert-AreEqual $createdProfile.Location "Global"

$endpointName = getAssetName
$responseSeconds = 75

$createdEndpoint = New-AzAfdEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName -OriginResponseTimeoutSecond $responseSeconds
$createdEndpoint = New-AzFrontDoorCdnEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName

Assert-AreEqual $endpointName $createdEndpoint.Name
Assert-AreEqual $responseSeconds $createdEndpoint.OriginResponseTimeoutSeconds

Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
}
Expand All @@ -61,13 +59,13 @@ function Test-GetAfdEndpoint
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
$createdProfile = New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
$createdProfile = New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$endpointName = getAssetName

New-AzAfdEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName
New-AzFrontDoorCdnEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName

$endpoint = Get-AzAfdEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName
$endpoint = Get-AzFrontDoorCdnEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName

Assert-AreEqual $endpointName $endpoint.Name
Assert-AreEqual "Global" $endpoint.Location
Expand All @@ -91,13 +89,13 @@ function Test-RemoveAfdEndpoint
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
$createdProfile = New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
$createdProfile = New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$endpointName = getAssetName

$createdEndpoint = New-AzAfdEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName
$createdEndpoint = New-AzFrontDoorCdnEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName

$isDeleted = Remove-AzAfdEndpoint -Endpoint $createdEndpoint -PassThru
$isDeleted = Remove-AzFrontDoorCdnEndpoint -Endpoint $createdEndpoint -PassThru

Assert-AreEqual $isDeleted true

Expand All @@ -120,20 +118,18 @@ function Test-SetAfdEndpoint
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
$createdProfile = New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
$createdProfile = New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$endpointName = getAssetName

New-AzAfdEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName
New-AzFrontDoorCdnEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName

$endpoint = Get-AzAfdEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName
$endpoint = Get-AzFrontDoorCdnEndpoint -ResourceGroupName $resourceGroupName -ProfileName $profileName -EndpointName $endpointName

$endpoint.Tags = @{"endpoint"="afd-standard"}
$endpoint.OriginResponseTimeoutSeconds = 100

$updatedEndpoint = Set-AzAfdEndpoint -Endpoint $endpoint
$updatedEndpoint = Set-AzFrontDoorCdnEndpoint -Endpoint $endpoint

Assert-AreEqual $endpoint.OriginResponseTimeoutSeconds $updatedEndpoint.OriginResponseTimeoutSeconds
Assert-AreEqual $endpoint.Tags["endpoint"] $updatedEndpoint.Tags["endpoint"]

Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
Expand Down
30 changes: 17 additions & 13 deletions src/Cdn/Cdn.Test/ScenarioTests/AfdOriginGroupTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@ function Test-CreateAfdOriginGroup
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$originGroupName = getAssetName
$sampleSize = 2

$originGroup = New-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
$originGroup = New-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize $sampleSize

Assert-AreEqual $originGroupName $originGroup.Name
Assert-AreEqual $originGroup.Type "Microsoft.Cdn/profiles/origingroups"
Assert-AreEqual $originGroup.SampleSize $sampleSize

Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
}
Expand All @@ -51,16 +53,18 @@ function Test-GetAfdOriginGroup
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$originGroupName = getAssetName
$successfulSamplesRequired = 1

New-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
New-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SuccessfulSamplesRequired $successfulSamplesRequired

$originGroup = Get-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
$originGroup = Get-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName

Assert-AreEqual $originGroupName $originGroup.Name
Assert-AreEqual $originGroup.Type "Microsoft.Cdn/profiles/origingroups"
Assert-AreEqual $originGroup.SuccessfulSamplesRequired $successfulSamplesRequired

Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
}
Expand All @@ -76,15 +80,15 @@ function Test-SetAfdOriginGroup
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$originGroupName = getAssetName

New-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
New-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize 2 -SuccessfulSamplesRequired 1

Set-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize 6 -SuccessfulSamplesRequired 3
Set-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize 6 -SuccessfulSamplesRequired 3

$originGroup = Get-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
$originGroup = Get-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName

Assert-AreEqual $originGroup.SampleSize 6
Assert-AreEqual $originGroup.SuccessfulSamplesRequired 3
Expand All @@ -103,15 +107,15 @@ function Test-RemoveAfdOriginGroup
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
$profile = New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
$profile = New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$originGroupName = getAssetName

$originGroup = New-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
$originGroup = New-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize 2 -SuccessfulSamplesRequired 1

Remove-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
Remove-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName

Assert-ThrowsContains { Get-AzAfdOriginGroup -ResourceId $originGroup.Id } "NotFound"
Assert-ThrowsContains { Get-AzFrontDoorCdnOriginGroup -ResourceId $originGroup.Id } "NotFound"

Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
}
29 changes: 16 additions & 13 deletions src/Cdn/Cdn.Test/ScenarioTests/AfdOriginTests.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ----------------------------------------------------------------------------------
#
# Copyright Microsoft Corporation
# Copyright Microsoft CorporationRemove-AzFrontDoorCdn
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand All @@ -23,17 +23,18 @@ function Test-CreateAfdOrigin
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft AFD Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$originGroupName = getAssetName
$sampleSize = 2

New-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
New-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize $sampleSize

$originName = getAssetName

$hostName = "contoso.com"

$origin = New-AzAfdOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -HostName $hostName
$origin = New-AzFrontDoorCdnOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -HostName $hostName

Assert-AreEqual $hostName $origin.HostName
Assert-AreEqual $originGroupName $origin.OriginGroupName
Expand All @@ -52,19 +53,20 @@ function Test-GetAfdOrigin
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft AFD Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$originGroupName = getAssetName
$sampleSize = 2

New-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
New-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize $sampleSize

$originName = getAssetName

$hostName = "example.org"

$newOrigin = New-AzAfdOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -HostName $hostName
$newOrigin = New-AzFrontDoorCdnOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -HostName $hostName

$getOrigin = Get-AzAfdOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName
$getOrigin = Get-AzFrontDoorCdnOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName

Assert-AreEqual $newOrigin.HostName $getOrigin.HostName
Assert-AreEqual $newOrigin.ProfileName $getOrigin.ProfileName
Expand All @@ -83,21 +85,22 @@ function Test-SetAfdOrigin
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft AFD Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$originGroupName = getAssetName
$sampleSize = 2

New-AzAfdOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName
New-AzFrontDoorCdnOriginGroup -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -SampleSize $sampleSize

$originName = getAssetName

$hostName = "example.org"

New-AzAfdOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -HostName $hostName
New-AzFrontDoorCdnOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -HostName $hostName

Set-AzAfdOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -Priority 5 -Weight 10
Set-AzFrontDoorCdnOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName -Priority 5 -Weight 10

$origin = Get-AzAfdOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName
$origin = Get-AzFrontDoorCdnOrigin -ResourceGroupName $resourceGroupName -ProfileName $profileName -OriginGroupName $originGroupName -OriginName $originName

Assert-AreEqual $origin.Priority 5
Assert-AreEqual $origin.Weight 10
Expand Down
12 changes: 6 additions & 6 deletions src/Cdn/Cdn.Test/ScenarioTests/AfdProfileTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function Test-CreateStandardAfdProfile
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
$createdProfile = New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
$createdProfile = New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

Assert-AreEqual $profileName $createdProfile.Name
Assert-AreEqual $profileSku $createdProfile.Sku
Expand All @@ -55,7 +55,7 @@ function Test-CreatePremiumAfdProfile
$profileTags = @{"ps-test-tag-name"="ps-test-tag-value"}

# Create a Microsoft CDN Profile
$createdProfile = New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku -Tag $profileTags
$createdProfile = New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku -Tag $profileTags

Assert-AreEqual $profileName $createdProfile.Name
Assert-AreEqual $profileSku $createdProfile.Sku
Expand All @@ -81,9 +81,9 @@ function Test-GetStandardAfdProfile
$profileSku = "Standard_AzureFrontDoor"

# Create a Microsoft CDN Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$profile = Get-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName
$profile = Get-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName

Assert-AreEqual $profileName $profile.Name
Assert-AreEqual $profileSku $profile.Sku
Expand All @@ -108,9 +108,9 @@ function Test-RemovePremiumAfdProfile
$profileSku = "Premium_AzureFrontDoor"

# Create a Microsoft CDN Profile
New-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku
New-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -Sku $profileSku

$isDeleted = Remove-AzAfdProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -PassThru
$isDeleted = Remove-AzFrontDoorCdnProfile -ResourceGroupName $resourceGroupName -ProfileName $profileName -PassThru

Assert-AreEqual $isDeleted true

Expand Down
Loading

0 comments on commit f17baf7

Please sign in to comment.