Skip to content

Commit 1ebdd0e

Browse files
author
Anil Kumar Yelam
committed
Addressing Mark's comments in Pull request
1 parent 372e6f8 commit 1ebdd0e

19 files changed

+372
-58
lines changed

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AdvisorTests.ps1

Lines changed: 71 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ function Test-ListServerAdvisors
2424

2525
try
2626
{
27-
$response = Get-AzureRmSqlServerAdvisor -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName
27+
$response = Get-AzureRmSqlServerAdvisor `
28+
-ResourceGroupName $server.ResourceGroupName `
29+
-ServerName $server.ServerName
2830
Assert-NotNull $response
2931
Assert-AreEqual 4 $response.Count
3032
foreach($advisor in $response)
@@ -46,13 +48,15 @@ function Test-ListServerAdvisors
4648
#>
4749
function Test-ListServerAdvisorsExpanded
4850
{
49-
# Setup
51+
# Setup
5052
$rg = Create-ResourceGroupForTest
5153
$server = SetupServer $rg
5254

5355
try
5456
{
55-
$response = Get-AzureRmSqlServerAdvisor -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -ExpandRecommendedActions
57+
$response = Get-AzureRmSqlServerAdvisor `
58+
-ResourceGroupName $server.ResourceGroupName `
59+
-ServerName $server.ServerName -ExpandRecommendedActions
5660
Assert-NotNull $response
5761
Assert-AreEqual 4 $response.Count
5862
foreach($advisor in $response)
@@ -80,7 +84,9 @@ function Test-GetServerAdvisor
8084

8185
try
8286
{
83-
$response = Get-AzureRmSqlServerAdvisor -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -AdvisorName CreateIndex
87+
$response = Get-AzureRmSqlServerAdvisor `
88+
-ResourceGroupName $server.ResourceGroupName `
89+
-ServerName $server.ServerName -AdvisorName CreateIndex
8490
Assert-NotNull $response
8591
ValidateServer $response $server
8692
ValidateAdvisorProperties $response
@@ -104,7 +110,11 @@ function Test-UpdateServerAdvisor
104110

105111
try
106112
{
107-
$response = Set-AzureRmSqlServerAdvisorAutoExecuteStatus -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -AdvisorName CreateIndex -AutoExecuteStatus Disabled
113+
$response = Set-AzureRmSqlServerAdvisorAutoExecuteStatus `
114+
-ResourceGroupName $server.ResourceGroupName `
115+
-ServerName $server.ServerName `
116+
-AdvisorName CreateIndex `
117+
-AutoExecuteStatus Disabled
108118
Assert-NotNull $response
109119
ValidateServer $response $server
110120
ValidateAdvisorProperties $response
@@ -128,7 +138,10 @@ function Test-ListDatabaseAdvisors
128138

129139
try
130140
{
131-
$response = Get-AzureRmSqlDatabaseAdvisor -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName
141+
$response = Get-AzureRmSqlDatabaseAdvisor `
142+
-ResourceGroupName $db.ResourceGroupName `
143+
-ServerName $db.ServerName `
144+
-DatabaseName $db.DatabaseName
132145
Assert-NotNull $response
133146
Assert-AreEqual 4 $response.Count
134147
foreach($advisor in $response)
@@ -156,7 +169,11 @@ function Test-ListDatabaseAdvisorsExpanded
156169

157170
try
158171
{
159-
$response = Get-AzureRmSqlDatabaseAdvisor -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName -ExpandRecommendedActions
172+
$response = Get-AzureRmSqlDatabaseAdvisor `
173+
-ResourceGroupName $db.ResourceGroupName `
174+
-ServerName $db.ServerName `
175+
-DatabaseName $db.DatabaseName `
176+
-ExpandRecommendedActions
160177
Assert-NotNull $response
161178
Assert-AreEqual 4 $response.Count
162179
foreach($advisor in $response)
@@ -184,7 +201,11 @@ function Test-GetDatabaseAdvisor
184201

185202
try
186203
{
187-
$response = Get-AzureRmSqlDatabaseAdvisor -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName -AdvisorName CreateIndex
204+
$response = Get-AzureRmSqlDatabaseAdvisor `
205+
-ResourceGroupName $db.ResourceGroupName `
206+
-ServerName $db.ServerName `
207+
-DatabaseName $db.DatabaseName `
208+
-AdvisorName CreateIndex
188209
Assert-NotNull $response
189210
ValidateDatabase $response $db
190211
ValidateAdvisorProperties $response
@@ -208,7 +229,12 @@ function Test-UpdateDatabaseAdvisor
208229

209230
try
210231
{
211-
$response = Set-AzureRmSqlDatabaseAdvisorAutoExecuteStatus -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName -AdvisorName CreateIndex -AutoExecuteStatus Disabled
232+
$response = Set-AzureRmSqlDatabaseAdvisorAutoExecuteStatus `
233+
-ResourceGroupName $db.ResourceGroupName `
234+
-ServerName $db.ServerName `
235+
-DatabaseName $db.DatabaseName `
236+
-AdvisorName CreateIndex `
237+
-AutoExecuteStatus Disabled
212238
Assert-NotNull $response
213239
ValidateDatabase $response $db
214240
ValidateAdvisorProperties $response
@@ -231,7 +257,10 @@ function Test-ListElasticPoolAdvisors
231257

232258
try
233259
{
234-
$response = Get-AzureRmSqlElasticPoolAdvisor -ResourceGroupName $ep.ResourceGroupName -ServerName $ep.ServerName -ElasticPoolName $ep.ElasticPoolName
260+
$response = Get-AzureRmSqlElasticPoolAdvisor `
261+
-ResourceGroupName $ep.ResourceGroupName`
262+
-ServerName $ep.ServerName`
263+
-ElasticPoolName $ep.ElasticPoolName
235264
Assert-NotNull $response
236265
Assert-AreEqual 4 $response.Count
237266
foreach($advisor in $response)
@@ -259,7 +288,11 @@ function Test-ListElasticPoolAdvisorsExpanded
259288

260289
try
261290
{
262-
$response = Get-AzureRmSqlElasticPoolAdvisor -ResourceGroupName $ep.ResourceGroupName -ServerName $ep.ServerName -ElasticPoolName $ep.ElasticPoolName -ExpandRecommendedActions
291+
$response = Get-AzureRmSqlElasticPoolAdvisor `
292+
-ResourceGroupName $ep.ResourceGroupName `
293+
-ServerName $ep.ServerName `
294+
-ElasticPoolName $ep.ElasticPoolName `
295+
-ExpandRecommendedActions
263296
Assert-NotNull $response
264297
Assert-AreEqual 4 $response.Count
265298
foreach($advisor in $response)
@@ -287,7 +320,11 @@ function Test-GetElasticPoolAdvisor
287320

288321
try
289322
{
290-
$response = Get-AzureRmSqlElasticPoolAdvisor -ResourceGroupName $ep.ResourceGroupName -ServerName $ep.ServerName -ElasticPoolName $ep.ElasticPoolName -AdvisorName CreateIndex
323+
$response = Get-AzureRmSqlElasticPoolAdvisor `
324+
-ResourceGroupName $ep.ResourceGroupName `
325+
-ServerName $ep.ServerName `
326+
-ElasticPoolName $ep.ElasticPoolName `
327+
-AdvisorName CreateIndex
291328
Assert-NotNull $response
292329
ValidateElasticPool $response $ep
293330
ValidateAdvisorProperties $response
@@ -311,8 +348,12 @@ function Test-UpdateElasticPoolAdvisor
311348

312349
try
313350
{
314-
$response = Set-AzureRmSqlElasticPoolAdvisorAutoExecuteStatus -ResourceGroupName $ep.ResourceGroupName -ServerName $ep.ServerName -ElasticPoolName $ep.ElasticPoolName -AdvisorName CreateIndex -AutoExecuteStatus Disabled
315-
#$response = Get-AzureRmSqlElasticPoolAdvisor -ResourceGroupName $ep.ResourceGroupName -ServerName $ep.ServerName -ElasticPoolName $ep.ElasticPoolName -AdvisorName CreateIndex
351+
$response = Set-AzureRmSqlElasticPoolAdvisorAutoExecuteStatus `
352+
-ResourceGroupName $ep.ResourceGroupName `
353+
-ServerName $ep.ServerName `
354+
-ElasticPoolName $ep.ElasticPoolName `
355+
-AdvisorName CreateIndex `
356+
-AutoExecuteStatus Disabled
316357
Assert-NotNull $response
317358
ValidateElasticPool $response $ep
318359
ValidateAdvisorProperties $response
@@ -344,7 +385,11 @@ function SetupDatabase($resourceGroup)
344385
{
345386
$server = SetupServer $resourceGroup
346387
$databaseName = Get-DatabaseName
347-
$db = New-AzureRmSqlDatabase -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -Edition Basic
388+
$db = New-AzureRmSqlDatabase `
389+
-ResourceGroupName $server.ResourceGroupName `
390+
-ServerName $server.ServerName `
391+
-DatabaseName $databaseName `
392+
-Edition Basic
348393
return $db
349394
}
350395

@@ -356,7 +401,10 @@ function SetupElasticPool($resourceGroup)
356401
{
357402
$server = SetupServer $resourceGroup
358403
$poolName = Get-ElasticPoolName
359-
$ep = New-AzureRmSqlElasticPool -ServerName $server.ServerName -ResourceGroupName $server.ResourceGroupName -ElasticPoolName $poolName -Edition Basic
404+
$ep = New-AzureRmSqlElasticPool `
405+
-ServerName $server.ServerName `
406+
-ResourceGroupName $server.ResourceGroupName `
407+
-ElasticPoolName $poolName -Edition Basic
360408
return $ep
361409
}
362410

@@ -399,7 +447,12 @@ function ValidateElasticPool($responseAdvisor, $expectedElasticPool)
399447
#>
400448
function ValidateAdvisorProperties($advisor, $expanded = $false)
401449
{
402-
Assert-True {($advisor.AdvisorStatus -eq "GA") -or ($advisor.AdvisorStatus -eq "PublicPreview") -or ($advisor.AdvisorStatus -eq "PrivatePreview")}
450+
Assert-True {($advisor.AdvisorStatus -eq "GA") `
451+
-or ($advisor.AdvisorStatus -eq "PublicPreview") `
452+
-or ($advisor.AdvisorStatus -eq "PrivatePreview")}
403453
Assert-AreEqual "Disabled" $advisor.AutoExecuteStatus
404-
Assert-True {($advisor.AutoExecuteStatusInheritedFrom -eq "Default") -or ($advisor.AutoExecuteStatusInheritedFrom -eq "Server") -or ($advisor.AutoExecuteStatusInheritedFrom -eq "ElasticPool") -or ($advisor.AutoExecuteStatusInheritedFrom -eq "Database")}
454+
Assert-True {($advisor.AutoExecuteStatusInheritedFrom -eq "Default") -or `
455+
($advisor.AutoExecuteStatusInheritedFrom -eq "Server") -or `
456+
($advisor.AutoExecuteStatusInheritedFrom -eq "ElasticPool") -or `
457+
($advisor.AutoExecuteStatusInheritedFrom -eq "Database")}
405458
}

0 commit comments

Comments
 (0)