Skip to content

Commit 467f5dc

Browse files
author
Chenglong Liu
committed
Merge branch 'feature/Cdn' into feature/Cdndev
2 parents 65aae21 + f40c50f commit 467f5dc

File tree

6 files changed

+343
-17
lines changed

6 files changed

+343
-17
lines changed

‎src/Cdn/Cdn.Autorest/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ directive:
163163
where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/originGroups/{originGroupName}"].delete
164164
transform: >-
165165
$["x-ms-long-running-operation-options"] = {"final-state-via": "azure-async-operation"}
166+
- from: swagger-document
167+
where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/origins/{originName}"].delete
168+
transform: >-
169+
$["x-ms-long-running-operation-options"] = {"final-state-via": "azure-async-operation"}
166170
- from: swagger-document
167171
where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}"].delete
168172
transform: >-

‎src/Cdn/Cdn.Autorest/test/Get-AzCdnOrigin.Tests.ps1

Lines changed: 108 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,117 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzCdnOrigin'))
1515
}
1616

1717
Describe 'Get-AzCdnOrigin' {
18-
It 'List' -skip {
19-
{ throw [System.NotImplementedException] } | Should -Not -Throw
18+
It 'List' {
19+
{
20+
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
21+
try
22+
{
23+
Write-Host -ForegroundColor Green "Create test group $($ResourceGroupName)"
24+
New-AzResourceGroup -Name $ResourceGroupName -Location $env.location
25+
26+
$cdnProfileName = 'p-' + (RandomString -allChars $false -len 6);
27+
Write-Host -ForegroundColor Green "Use cdnProfileName : $($cdnProfileName)"
28+
29+
$profileSku = "Standard_Microsoft";
30+
New-AzCdnProfile -SkuName $profileSku -Name $cdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
31+
32+
$endpointName = 'e-' + (RandomString -allChars $false -len 6);
33+
$origin = @{
34+
Name = "origin1"
35+
HostName = "host1.hello.com"
36+
};
37+
$location = "westus"
38+
Write-Host -ForegroundColor Green "Create endpointName : $($endpointName), origin.Name : $($origin.Name), origin.HostName : $($origin.HostName)"
39+
40+
New-AzCdnEndpoint -Name $endpointName -ResourceGroupName $ResourceGroupName -ProfileName $cdnProfileName -Location $location -Origin $origin
41+
$origins = Get-AzCdnOrigin -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName
42+
43+
$origins.Count | Should -Be 1
44+
} Finally
45+
{
46+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
47+
}
48+
} | Should -Not -Throw
2049
}
2150

22-
It 'Get' -skip {
23-
{ throw [System.NotImplementedException] } | Should -Not -Throw
51+
It 'Get' {
52+
{
53+
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
54+
try
55+
{
56+
Write-Host -ForegroundColor Green "Create test group $($ResourceGroupName)"
57+
New-AzResourceGroup -Name $ResourceGroupName -Location $env.location
58+
59+
$cdnProfileName = 'p-' + (RandomString -allChars $false -len 6);
60+
Write-Host -ForegroundColor Green "Use cdnProfileName : $($cdnProfileName)"
61+
62+
$profileSku = "Standard_Microsoft";
63+
New-AzCdnProfile -SkuName $profileSku -Name $cdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
64+
65+
$endpointName = 'e-' + (RandomString -allChars $false -len 6);
66+
$originName = "origin1"
67+
$originHostName = "host1.hello.com"
68+
$originHttpPort = 80
69+
$origin = @{
70+
Name = $originName
71+
HostName = $originHostName
72+
HttpPort = $originHttpPort
73+
};
74+
$location = "westus"
75+
Write-Host -ForegroundColor Green "Create endpointName : $($endpointName), origin.Name : $($origin.Name), origin.HostName : $($origin.HostName)"
76+
77+
New-AzCdnEndpoint -Name $endpointName -ResourceGroupName $ResourceGroupName -ProfileName $cdnProfileName -Location $location -Origin $origin
78+
$origin = Get-AzCdnOrigin -Name $originName -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName
79+
80+
$origin.Name | Should -Be $originName
81+
$origin.HostName | Should -Be $originHostName
82+
$origin.HttpPort | Should -Be $originHttpPort
83+
$origin.HttpsPort | Should -Be $null
84+
} Finally
85+
{
86+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
87+
}
88+
} | Should -Not -Throw
2489
}
2590

26-
It 'GetViaIdentity' -skip {
27-
{ throw [System.NotImplementedException] } | Should -Not -Throw
91+
It 'GetViaIdentity' {
92+
{
93+
$PSDefaultParameterValues['Disabled'] = $true
94+
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
95+
try
96+
{
97+
Write-Host -ForegroundColor Green "Create test group $($ResourceGroupName)"
98+
New-AzResourceGroup -Name $ResourceGroupName -Location $env.location
99+
100+
$cdnProfileName = 'p-' + (RandomString -allChars $false -len 6);
101+
Write-Host -ForegroundColor Green "Use cdnProfileName : $($cdnProfileName)"
102+
103+
$profileSku = "Standard_Microsoft";
104+
New-AzCdnProfile -SkuName $profileSku -Name $cdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
105+
106+
$endpointName = 'e-' + (RandomString -allChars $false -len 6);
107+
$originName = "origin1"
108+
$originHostName = "host1.hello.com"
109+
$originHttpPort = 80
110+
$origin = @{
111+
Name = $originName
112+
HostName = $originHostName
113+
HttpPort = $originHttpPort
114+
};
115+
$location = "westus"
116+
Write-Host -ForegroundColor Green "Create endpointName : $($endpointName), origin.Name : $($origin.Name), origin.HostName : $($origin.HostName)"
117+
118+
New-AzCdnEndpoint -Name $endpointName -ResourceGroupName $ResourceGroupName -ProfileName $cdnProfileName -Location $location -Origin $origin
119+
$origin = Get-AzCdnOrigin -Name $originName -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName | Get-AzCdnOrigin
120+
121+
$origin.Name | Should -Be $originName
122+
$origin.HostName | Should -Be $originHostName
123+
$origin.HttpPort | Should -Be $originHttpPort
124+
$origin.HttpsPort | Should -Be $null
125+
} Finally
126+
{
127+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
128+
}
129+
} | Should -Not -Throw
28130
}
29131
}

‎src/Cdn/Cdn.Autorest/test/New-AzCdnOrigin.Tests.ps1

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,52 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzCdnOrigin'))
1515
}
1616

1717
Describe 'New-AzCdnOrigin' {
18-
It 'CreateExpanded' -skip {
19-
{ throw [System.NotImplementedException] } | Should -Not -Throw
18+
It 'CreateExpanded' {
19+
{
20+
$subId = $env.SubscriptionId
21+
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
22+
try
23+
{
24+
Write-Host -ForegroundColor Green "Create test group $($ResourceGroupName)"
25+
New-AzResourceGroup -Name $ResourceGroupName -Location $env.location
26+
27+
$cdnProfileName = 'p-' + (RandomString -allChars $false -len 6);
28+
Write-Host -ForegroundColor Green "Use cdnProfileName : $($cdnProfileName)"
29+
30+
$profileSku = "Standard_Microsoft";
31+
New-AzCdnProfile -SkuName $profileSku -Name $cdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
32+
33+
$endpointName = 'e-' + (RandomString -allChars $false -len 6);
34+
Write-Host -ForegroundColor Green "Create endpointName : $($endpointName)"
35+
36+
$origin = @{
37+
Name = "origin1"
38+
HostName = "host1.hello.com"
39+
};
40+
$location = "westus"
41+
$originId = "/subscriptions/$subId/resourcegroups/$ResourceGroupName/providers/Microsoft.Cdn/profiles/$cdnProfileName/endpoints/$endpointName/origins/$($origin.Name)"
42+
$originGroup = @{
43+
Name = "originGroup1"
44+
HealthProbeSettingProbeIntervalInSecond = 240
45+
HealthProbeSettingProbePath = "/health.aspx"
46+
HealthProbeSettingProbeProtocol = "Https"
47+
HealthProbeSettingProbeRequestType = "GET"
48+
Origin = @(@{
49+
Id = $originId
50+
})
51+
}
52+
$defaultOriginGroup = "/subscriptions/$subId/resourcegroups/$ResourceGroupName/providers/Microsoft.Cdn/profiles/$cdnProfileName/endpoints/$endpointName/origingroups/$($originGroup.Name)"
53+
New-AzCdnEndpoint -Name $endpointName -ResourceGroupName $ResourceGroupName -ProfileName $cdnProfileName -Location $location `
54+
-Origin $origin -OriginGroup $originGroup -DefaultOriginGroupId $defaultOriginGroup
55+
56+
$origin = New-AzCdnOrigin -Name "origin2" -HostName "host2.hello.com" -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName
57+
58+
$origin.Name | Should -Be "origin2"
59+
$origin.HostName | Should -Be "host2.hello.com"
60+
} Finally
61+
{
62+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
63+
}
64+
} | Should -Not -Throw
2065
}
2166
}

‎src/Cdn/Cdn.Autorest/test/Remove-AzCdnOrigin.Tests.ps1

Lines changed: 91 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,98 @@ if(($null -eq $TestName) -or ($TestName -contains 'Remove-AzCdnOrigin'))
1515
}
1616

1717
Describe 'Remove-AzCdnOrigin' {
18-
It 'Delete' -skip {
19-
{ throw [System.NotImplementedException] } | Should -Not -Throw
18+
It 'Delete' {
19+
{
20+
$subId = $env.SubscriptionId
21+
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
22+
try
23+
{
24+
Write-Host -ForegroundColor Green "Create test group $($ResourceGroupName)"
25+
New-AzResourceGroup -Name $ResourceGroupName -Location $env.location
26+
27+
$cdnProfileName = 'p-' + (RandomString -allChars $false -len 6);
28+
Write-Host -ForegroundColor Green "Use cdnProfileName : $($cdnProfileName)"
29+
30+
$profileSku = "Standard_Microsoft";
31+
New-AzCdnProfile -SkuName $profileSku -Name $cdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
32+
33+
$endpointName = 'e-' + (RandomString -allChars $false -len 6);
34+
Write-Host -ForegroundColor Green "Create endpointName : $($endpointName)"
35+
36+
$origin = @{
37+
Name = "origin1"
38+
HostName = "host1.hello.com"
39+
};
40+
$location = "westus"
41+
$originId = "/subscriptions/$subId/resourcegroups/$ResourceGroupName/providers/Microsoft.Cdn/profiles/$cdnProfileName/endpoints/$endpointName/origins/$($origin.Name)"
42+
$originGroup = @{
43+
Name = "originGroup1"
44+
HealthProbeSettingProbeIntervalInSecond = 240
45+
HealthProbeSettingProbePath = "/health.aspx"
46+
HealthProbeSettingProbeProtocol = "Https"
47+
HealthProbeSettingProbeRequestType = "GET"
48+
Origin = @(@{
49+
Id = $originId
50+
})
51+
}
52+
$defaultOriginGroup = "/subscriptions/$subId/resourcegroups/$ResourceGroupName/providers/Microsoft.Cdn/profiles/$cdnProfileName/endpoints/$endpointName/origingroups/$($originGroup.Name)"
53+
New-AzCdnEndpoint -Name $endpointName -ResourceGroupName $ResourceGroupName -ProfileName $cdnProfileName -Location $location `
54+
-Origin $origin -OriginGroup $originGroup -DefaultOriginGroupId $defaultOriginGroup
55+
56+
New-AzCdnOrigin -Name "origin2" -HostName "host2.hello.com" -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName
57+
Remove-AzCdnOrigin -Name "origin2" -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName
58+
} Finally
59+
{
60+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
61+
}
62+
} | Should -Not -Throw
2063
}
2164

22-
It 'DeleteViaIdentity' -skip {
23-
{ throw [System.NotImplementedException] } | Should -Not -Throw
65+
It 'DeleteViaIdentity' {
66+
{
67+
$PSDefaultParameterValues['Disabled'] = $true
68+
$subId = $env.SubscriptionId
69+
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
70+
try
71+
{
72+
Write-Host -ForegroundColor Green "Create test group $($ResourceGroupName)"
73+
New-AzResourceGroup -Name $ResourceGroupName -Location $env.location
74+
75+
$cdnProfileName = 'p-' + (RandomString -allChars $false -len 6);
76+
Write-Host -ForegroundColor Green "Use cdnProfileName : $($cdnProfileName)"
77+
78+
$profileSku = "Standard_Microsoft";
79+
New-AzCdnProfile -SkuName $profileSku -Name $cdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
80+
81+
$endpointName = 'e-' + (RandomString -allChars $false -len 6);
82+
Write-Host -ForegroundColor Green "Create endpointName : $($endpointName)"
83+
84+
$origin = @{
85+
Name = "origin1"
86+
HostName = "host1.hello.com"
87+
};
88+
$location = "westus"
89+
$originId = "/subscriptions/$subId/resourcegroups/$ResourceGroupName/providers/Microsoft.Cdn/profiles/$cdnProfileName/endpoints/$endpointName/origins/$($origin.Name)"
90+
$originGroup = @{
91+
Name = "originGroup1"
92+
HealthProbeSettingProbeIntervalInSecond = 240
93+
HealthProbeSettingProbePath = "/health.aspx"
94+
HealthProbeSettingProbeProtocol = "Https"
95+
HealthProbeSettingProbeRequestType = "GET"
96+
Origin = @(@{
97+
Id = $originId
98+
})
99+
}
100+
$defaultOriginGroup = "/subscriptions/$subId/resourcegroups/$ResourceGroupName/providers/Microsoft.Cdn/profiles/$cdnProfileName/endpoints/$endpointName/origingroups/$($originGroup.Name)"
101+
New-AzCdnEndpoint -Name $endpointName -ResourceGroupName $ResourceGroupName -ProfileName $cdnProfileName -Location $location `
102+
-Origin $origin -OriginGroup $originGroup -DefaultOriginGroupId $defaultOriginGroup
103+
104+
New-AzCdnOrigin -Name "origin2" -HostName "host2.hello.com" -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName
105+
Get-AzCdnOrigin -Name "origin2" -EndpointName $endpointName -ProfileName $cdnProfileName -ResourceGroupName $ResourceGroupName | Remove-AzCdnOrigin
106+
} Finally
107+
{
108+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
109+
}
110+
} | Should -Not -Throw
24111
}
25112
}

‎src/Cdn/Cdn.Autorest/test/Update-AzCdnEndpoint.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Update-AzCdnEndpoint'))
1515
}
1616

1717
Describe 'Update-AzCdnEndpoint' {
18-
It 'UpdateExpanded' -skip {
18+
It 'UpdateExpanded' {
1919
{
2020
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
2121
try

0 commit comments

Comments
 (0)