Skip to content

Commit 6853156

Browse files
markcowlmarkcowl
committed
Merge pull request #2277 from csmengwan/dev
Integret Akamai to Azure Cdn
2 parents 1fad4e4 + 69990a9 commit 6853156

File tree

22 files changed

+4024
-6821
lines changed

22 files changed

+4024
-6821
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Management.Cdn">
60-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Cdn.1.0.3-preview\lib\portable-net45+win+wpa81\Microsoft.Azure.Management.Cdn.dll</HintPath>
60+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Cdn.1.1.0\lib\portable-net45+win+wpa81\Microsoft.Azure.Management.Cdn.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6363
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/CustomDomainTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Test-CustomDomainGetRemoveWithRunningEndpoint
2525
$profileName = getAssetName
2626
$resourceGroup = TestSetup-CreateResourceGroup
2727
$resourceLocation = "EastUS"
28-
$profileSku = "Standard"
28+
$profileSku = "StandardVerizon"
2929
$tags = @{"tag1" = "value1"; "tag2" = "value2"}
3030
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku -Tags $tags
3131

@@ -68,7 +68,7 @@ function Test-CustomDomainGetRemoveWithStoppedEndpoint
6868
$profileName = getAssetName
6969
$resourceGroup = TestSetup-CreateResourceGroup
7070
$resourceLocation = "EastUS"
71-
$profileSku = "Standard"
71+
$profileSku = "StandardVerizon"
7272
$tags = @{"tag1" = "value1"; "tag2" = "value2"}
7373
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku -Tags $tags
7474

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/EndpointTests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Test-EndpointCrudAndAction
2121
$profileName = getAssetName
2222
$resourceGroup = TestSetup-CreateResourceGroup
2323
$resourceLocation = "EastUS"
24-
$profileSku = "Standard"
24+
$profileSku = "StandardVerizon"
2525
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
2626

2727
$endpointName = getAssetName
@@ -77,7 +77,7 @@ function Test-EndpointCrudAndActionWithPiping
7777
$profileName = getAssetName
7878
$resourceGroup = TestSetup-CreateResourceGroup
7979
$resourceLocation = "EastUS"
80-
$profileSku = "Standard"
80+
$profileSku = "StandardVerizon"
8181
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
8282

8383
$endpointName = getAssetName
@@ -142,7 +142,7 @@ function Test-EndpointCrudAndActionWithAllProperties
142142
$profileName = getAssetName
143143
$resourceGroup = TestSetup-CreateResourceGroup
144144
$resourceLocation = "EastUS"
145-
$profileSku = "Standard"
145+
$profileSku = "StandardVerizon"
146146
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
147147

148148
$endpointName = getAssetName
@@ -221,7 +221,7 @@ function Test-EndpointCrudAndActionWithAllPropertiesWithPiping
221221
$profileName = getAssetName
222222
$resourceGroup = TestSetup-CreateResourceGroup
223223
$resourceLocation = "EastUS"
224-
$profileSku = "Standard"
224+
$profileSku = "StandardVerizon"
225225
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
226226

227227
$endpointName = getAssetName
@@ -306,7 +306,7 @@ function Test-EndpointCrudAndActionWithStoppedEndpoint
306306
$profileName = getAssetName
307307
$resourceGroup = TestSetup-CreateResourceGroup
308308
$resourceLocation = "EastUS"
309-
$profileSku = "Standard"
309+
$profileSku = "StandardVerizon"
310310
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
311311

312312
$endpointName = getAssetName

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/OriginTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Test-OriginGetSetWithRunningEndpoint
2121
$profileName = getAssetName
2222
$resourceGroup = TestSetup-CreateResourceGroup
2323
$resourceLocation = "EastUS"
24-
$profileSku = "Standard"
24+
$profileSku = "StandardVerizon"
2525
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
2626

2727
$endpointName = getAssetName
@@ -60,7 +60,7 @@ function Test-OriginGetSetWithStoppedEndpoint
6060
$profileName = getAssetName
6161
$resourceGroup = TestSetup-CreateResourceGroup
6262
$resourceLocation = "EastUS"
63-
$profileSku = "Standard"
63+
$profileSku = "StandardVerizon"
6464
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
6565

6666
$endpointName = getAssetName
@@ -100,7 +100,7 @@ function Test-OriginGetSetWhenEndpointDoesnotExist
100100
$profileName = getAssetName
101101
$resourceGroup = TestSetup-CreateResourceGroup
102102
$resourceLocation = "EastUS"
103-
$profileSku = "Standard"
103+
$profileSku = "StandardVerizon"
104104
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
105105

106106
$endpointName = getAssetName

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Test-ProfileCrud
2121
$profileName = getAssetName
2222
$resourceGroup = TestSetup-CreateResourceGroup
2323
$profileLocation = "EastUS"
24-
$profileSku = "Standard"
24+
$profileSku = "StandardVerizon"
2525
$tags = @{"tag1" = "value1"; "tag2" = "value2"}
2626
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku -Tags $tags
2727

@@ -68,7 +68,7 @@ function Test-ProfileDeleteAndSsoWithPiping
6868
$profileName = getAssetName
6969
$resourceGroup = TestSetup-CreateResourceGroup
7070
$profileLocation = "EastUS"
71-
$profileSku = "Standard"
71+
$profileSku = "StandardVerizon"
7272
$tags = @{"tag1" = "value1"; "tag2" = "value2"}
7373
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku -Tags $tags
7474

0 commit comments

Comments
 (0)