Skip to content

Commit b833d86

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#3216 from LukaszStem/dev
PerSiteScaling and NumberOfWorkers
2 parents 8ee40bb + 2932657 commit b833d86

File tree

56 files changed

+14972
-10365
lines changed

Some content is hidden

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

56 files changed

+14972
-10365
lines changed

‎src/ResourceManager/Websites/ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,9 @@
1919
-->
2020
## Current Release
2121

22+
* Add: PerSiteScaling option on cmdlets New-AzureRmAppservicePlan and Set-AzureRmAppServicePlan
23+
* Add: NumberOfWorkers option on cmdlets Set-AzureRmWebApp and Set-AzureRmWebAppSlot
24+
* Add: Help documentation using platyPS
25+
26+
2227
## Version 2.3.0

‎src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/AppServicePlanTests.ps1

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ function Test-CreateNewAppServicePlan
4747
Assert-AreEqual $skuName $getResult.Sku.Name
4848
Assert-AreEqual $capacity $getResult.Sku.Capacity
4949
}
50-
finally
51-
{
50+
finally
51+
{
5252
# Cleanup
5353
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Force
5454
Remove-AzureRmResourceGroup -Name $rgname -Force
55-
}
55+
}
5656
}
5757

5858
<#
@@ -68,39 +68,44 @@ function Test-SetAppServicePlan
6868
$tier = "Shared"
6969
$skuName ="D1"
7070
$capacity = 0
71+
$perSiteScaling = $false;
7172

7273
$newTier ="Standard"
7374
$newSkuName = "S2"
7475
$newWorkerSize = "Medium"
7576
$newCapacity = 2
77+
$newPerSiteScaling = $true;
78+
7679

7780
try
7881
{
7982
#Setup
8083
New-AzureRmResourceGroup -Name $rgname -Location $location
8184
# Test
82-
$actual = New-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Location $location -Tier $tier
85+
$actual = New-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Location $location -Tier $tier -PerSiteScaling $perSiteScaling
8386
$result = Get-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName
8487
# Assert
8588
Assert-AreEqual $whpName $result.Name
8689
Assert-AreEqual $capacity $result.Sku.Capacity
8790
Assert-AreEqual $tier $result.Sku.Tier
8891
Assert-AreEqual $skuName $result.Sku.Name
92+
Assert-AreEqual $perSiteScaling $result.PerSiteScaling
8993

9094
# Set the created service plan
91-
$newresult = Set-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Tier $newTier -NumberofWorkers $newCapacity -WorkerSize $newWorkerSize
95+
$newresult = Set-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Tier $newTier -NumberofWorkers $newCapacity -WorkerSize $newWorkerSize -PerSiteScaling $newPerSiteScaling
9296

9397
# Assert
9498
Assert-AreEqual $whpName $newresult.Name
9599
Assert-AreEqual $newCapacity $newresult.Sku.Capacity
96100
Assert-AreEqual $newTier $newresult.Sku.Tier
97101
Assert-AreEqual $newSkuName $newresult.Sku.Name
102+
Assert-AreEqual $newPerSiteScaling $newresult.PerSiteScaling
98103

99104
# Set service plan via pipeline
100105
$newresult.Sku.Capacity = $capacity
101106
$newresult.Sku.Tier = $tier
102107
$newresult.Sku.Name = $skuName
103-
108+
$newresult.PerSiteScaling = $perSiteScaling
104109

105110
$newresult | Set-AzureRmAppServicePlan
106111

@@ -112,13 +117,15 @@ function Test-SetAppServicePlan
112117
Assert-AreEqual $capacity $newresult.Sku.Capacity
113118
Assert-AreEqual $tier $newresult.Sku.Tier
114119
Assert-AreEqual $skuName $newresult.Sku.Name
120+
Assert-AreEqual $perSiteScaling $newresult.PerSiteScaling
121+
115122
}
116-
finally
117-
{
123+
finally
124+
{
118125
# Cleanup
119126
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Force
120127
Remove-AzureRmResourceGroup -Name $rgname -Force
121-
}
128+
}
122129
}
123130

124131
<#
@@ -208,13 +215,13 @@ function Test-GetAppServicePlan
208215
Assert-True { $result -contains $serverFarmName2 }
209216

210217
}
211-
finally
218+
finally
212219
{
213220
# Cleanup
214221
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $serverFarmName1 -Force
215222
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $serverFarmName2 -Force
216223
Remove-AzureRmResourceGroup -Name $rgname -Force
217-
}
224+
}
218225
}
219226

220227
<#
@@ -251,11 +258,11 @@ function Test-RemoveAppServicePlan
251258

252259
Assert-AreEqual 0 $result.Count
253260
}
254-
finally
255-
{
261+
finally
262+
{
256263
# Cleanup
257264
Remove-AzureRmResourceGroup -Name $rgname -Force
258-
}
265+
}
259266
}
260267

261268
<#
@@ -303,12 +310,12 @@ function Test-GetAppServicePlanMetrics
303310
Assert-True { $actualMetricsNames -contains $i}
304311
}
305312
}
306-
finally
313+
finally
307314
{
308315
# Cleanup
309316
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $appServicePlanName -Force
310317
Remove-AzureRmResourceGroup -Name $rgname -Force
311-
}
318+
}
312319
}
313320

314321
<#
@@ -348,10 +355,10 @@ function Test-CreateNewAppServicePlanInAse
348355
Assert-AreEqual $skuName $getResult.Sku.Name
349356
Assert-AreEqual $capacity $getResult.Sku.Capacity
350357
}
351-
finally
352-
{
358+
finally
359+
{
353360
# Cleanup
354361
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $whpName -Force
355362
Remove-AzureRmResourceGroup -Name $rgname -Force
356-
}
363+
}
357364
}

‎src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppSlotTests.ps1

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ function Test-GetWebAppSlot
8181
Assert-True { $slotNames -contains $appWithSlotName1 }
8282
Assert-True { $slotNames -contains $appWithSlotName2 }
8383
}
84-
finally
84+
finally
8585
{
8686
# Cleanup
8787
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname1 -Force
8888
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname2 -Force
8989
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
9090
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName -Force
9191
Remove-AzureRmResourceGroup -Name $rgname -Force
92-
}
92+
}
9393
}
9494

9595
<#
@@ -159,14 +159,14 @@ function Test-GetWebAppSlotMetrics
159159
Assert-True { $actualMetricNames -contains $i}
160160
}
161161
}
162-
finally
162+
finally
163163
{
164164
# Cleanup
165165
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
166166
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
167167
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName -Force
168168
Remove-AzureRmResourceGroup -Name $rgname -Force
169-
}
169+
}
170170
}
171171

172172
<#
@@ -242,14 +242,14 @@ function Test-StartStopRestartWebAppSlot
242242
Assert-AreEqual "Running" $slot.State
243243
$ping = PingWebApp $slot
244244
}
245-
finally
245+
finally
246246
{
247247
# Cleanup
248248
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
249249
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
250250
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName -Force
251251
Remove-AzureRmResourceGroup -Name $rgname -Force
252-
}
252+
}
253253
}
254254

255255
<#
@@ -294,14 +294,14 @@ function Test-CloneWebAppToSlot
294294
# Assert
295295
Assert-AreEqual $appWithSlotName $slot.Name
296296
}
297-
finally
297+
finally
298298
{
299299
# Cleanup
300300
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
301301
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
302302
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName -Force
303303
Remove-AzureRmResourceGroup -Name $rgname -Force
304-
}
304+
}
305305
}
306306

307307
<#
@@ -363,7 +363,7 @@ function Test-CloneWebAppSlot
363363
# Assert
364364
Assert-AreEqual $appWithSlotName2 $slot2.Name
365365
}
366-
finally
366+
finally
367367
{
368368
# Cleanup
369369
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
@@ -374,7 +374,7 @@ function Test-CloneWebAppSlot
374374
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $destAppName -Force
375375
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $destPlanName -Force
376376
Remove-AzureRmResourceGroup -Name $rgname -Force
377-
}
377+
}
378378
}
379379

380380
<#
@@ -420,14 +420,14 @@ function Test-CreateNewWebAppSlot
420420
Assert-AreEqual $appWithSlotName $slot1.Name
421421
Assert-AreEqual $serverFarm.Id $slot1.ServerFarmId
422422
}
423-
finally
423+
finally
424424
{
425425
# Cleanup
426426
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
427427
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
428428
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName -Force
429429
Remove-AzureRmResourceGroup -Name $rgname -Force
430-
}
430+
}
431431
}
432432

433433
<#
@@ -481,12 +481,12 @@ function Test-CreateNewWebAppSlotOnAse
481481
Assert-AreEqual $serverFarm.Id $slot1.ServerFarmId
482482

483483
}
484-
finally
484+
finally
485485
{
486486
# Cleanup
487487
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
488488
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
489-
}
489+
}
490490
}
491491

492492
<#
@@ -506,6 +506,7 @@ function Test-SetWebAppSlot
506506
$tier2 = "Standard"
507507
$apiversion = "2015-08-01"
508508
$resourceType = "Microsoft.Web/sites"
509+
$numberOfWorkers = 2
509510

510511
try
511512
{
@@ -552,7 +553,7 @@ function Test-SetWebAppSlot
552553
$appSettings = @{ "setting1" = "valueA"; "setting2" = "valueB"}
553554
$connectionStrings = @{ connstring1 = @{ Type="MySql"; Value="string value 1"}; connstring2 = @{ Type = "SQLAzure"; Value="string value 2"}}
554555

555-
$slot = Set-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -ConnectionStrings $connectionStrings
556+
$slot = Set-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -ConnectionStrings $connectionStrings -numberofworkers $numberOfWorkers
556557

557558
# Assert
558559
Assert-AreEqual $appWithSlotName $slot.Name
@@ -568,16 +569,18 @@ function Test-SetWebAppSlot
568569
{
569570
Assert-True { $connectionStrings.Keys -contains $connStringInfo.Name }
570571
}
572+
573+
Assert-AreEqual $numberOfWorkers $slot.SiteConfig.NumberOfWorkers
571574
}
572-
finally
575+
finally
573576
{
574577
# Cleanup
575578
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
576579
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
577580
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName1 -Force
578581
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName2 -Force
579582
Remove-AzureRmResourceGroup -Name $rgname -Force
580-
}
583+
}
581584
}
582585

583586
<#
@@ -625,13 +628,13 @@ function Test-RemoveWebAppSlot
625628

626629
Assert-False { $slotNames -contains $appname }
627630
}
628-
finally
631+
finally
629632
{
630633
# Cleanup
631634
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
632635
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName -Force
633636
Remove-AzureRmResourceGroup -Name $rgname -Force
634-
}
637+
}
635638
}
636639

637640
<#
@@ -695,14 +698,14 @@ function Test-WebAppSlotPublishingProfile
695698
# Assert
696699
Assert-True { $fileZillaProfile.Name -eq $appWithSlotName3 }
697700
}
698-
finally
701+
finally
699702
{
700703
# Cleanup
701704
Remove-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -Force
702705
Remove-AzureRmWebApp -ResourceGroupName $rgname -Name $appname -Force
703706
Remove-AzureRmAppServicePlan -ResourceGroupName $rgname -Name $planName -Force
704707
Remove-AzureRmResourceGroup -Name $rgname -Force
705-
}
708+
}
706709
}
707710

708711
<#

0 commit comments

Comments
 (0)