Skip to content

Commit a0e33ed

Browse files
author
maddieclayton
authored
Merge pull request #5244 from akromm/SqlAsJob
Adding AsJob parameter to SQL cmdlets
2 parents 68a9061 + 14cdbd9 commit a0e33ed

File tree

183 files changed

+1354
-821
lines changed

Some content is hidden

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

183 files changed

+1354
-821
lines changed

‎src/ResourceManager/Sql/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
## Current Release
2121
* Added Location Completer to -Location parameters allowing tab completion through valid Locations
2222
* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
23+
* Added -AsJob parameter to long running cmdlets
24+
* Obsoleted -DatabaseName parameter from Get-AzureRmSqlServiceObjective
2325

2426
## Version 4.1.1
2527
* Added ability to rename database using Set-AzureRmSqlDatabase

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ function Test-DatabasePauseResume
4343
Assert-AreEqual $dwdb2.Status "Paused"
4444

4545
# Resume the database. Make sure the database specs remain the same and its Status is Online.
46-
$dwdb3 = Resume-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $dwdb.DatabaseName
46+
$job = Resume-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $dwdb.DatabaseName -AsJob
47+
$job | Wait-Job
48+
$dwdb3 = $job.Output
49+
4750
Assert-AreEqual $dwdb3.DatabaseName $databaseName
4851
Assert-AreEqual $dwdb3.MaxSizeBytes $maxSizeBytes
4952
Assert-AreEqual $dwdb3.Edition DataWarehouse
@@ -81,7 +84,10 @@ function Test-DatabasePauseResumePiped
8184

8285

8386
# Pause the database. Make sure the database specs remain the same and its Status is Paused.
84-
$dwdb2 = $dwdb | Suspend-AzureRmSqlDatabase
87+
$job = $dwdb | Suspend-AzureRmSqlDatabase -AsJob
88+
$job | Wait-Job
89+
$dwdb2 = $job.Output
90+
8591
Assert-AreEqual $dwdb2.DatabaseName $databaseName
8692
Assert-AreEqual $dwdb2.MaxSizeBytes $maxSizeBytes
8793
Assert-AreEqual $dwdb2.Edition DataWarehouse

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ function Test-RestoreGeoBackup
6464
$db = Get-AzureRmSqlDatabase -ServerName $server.ServerName -DatabaseName hchung-testdb-geo2 -ResourceGroupName $rg.ResourceGroupName
6565
$restoredDbName = "powershell_db_georestored"
6666

67-
Get-AzureRmSqlDatabaseGeoBackup -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -DatabaseName $db.DatabaseName | Restore-AzureRmSqlDatabase -FromGeoBackup -TargetDatabaseName $restoredDbName
67+
$geobackup = Get-AzureRmSqlDatabaseGeoBackup -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -DatabaseName $db.DatabaseName
68+
$job = $geobackup | Restore-AzureRmSqlDatabase -FromGeoBackup -TargetDatabaseName $restoredDbName -AsJob
69+
$job | Wait-Job
6870
}
6971

7072
function Test-RestoreDeletedDatabaseBackup
@@ -77,7 +79,9 @@ function Test-RestoreDeletedDatabaseBackup
7779
$droppedDbName = "powershell_db_georestored"
7880
$restoredDbName = "powershell_db_deleted"
7981

80-
Get-AzureRmSqlDeletedDatabaseBackup -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName -DatabaseName $droppedDbName -DeletionDate "2016-02-23T00:21:22.847Z" | Restore-AzureRmSqlDatabase -FromDeletedDatabaseBackup -TargetDatabaseName $restoredDbName
82+
$deletedDb = Get-AzureRmSqlDeletedDatabaseBackup -ResourceGroupName $server.ResourceGroupName -ServerName $server.ServerName `
83+
-DatabaseName $droppedDbName -DeletionDate "2016-02-23T00:21:22.847Z"
84+
$deletedDb | Restore-AzureRmSqlDatabase -FromDeletedDatabaseBackup -TargetDatabaseName $restoredDbName
8185
}
8286

8387
function Test-RestorePointInTimeBackup
@@ -90,7 +94,8 @@ function Test-RestorePointInTimeBackup
9094
$db = Get-AzureRmSqlDatabase -ServerName $server.ServerName -DatabaseName hchung-testdb -ResourceGroupName $rg.ResourceGroupName
9195
$restoredDbName = "powershell_db_restored"
9296

93-
Get-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $db.DatabaseName | Restore-AzureRmSqlDatabase -FromPointInTimeBackup -PointInTime "2016-02-20T00:06:00Z" -TargetDatabaseName $restoredDbName
97+
Get-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $db.DatabaseName |
98+
Restore-AzureRmSqlDatabase -FromPointInTimeBackup -PointInTime "2016-02-20T00:06:00Z" -TargetDatabaseName $restoredDbName
9499
}
95100

96101
function Test-ServerBackupLongTermRetentionVault
@@ -119,7 +124,8 @@ function Test-DatabaseBackupLongTermRetentionPolicy
119124
$policyResourceId = "/subscriptions/e5e8af86-2d93-4ebd-8eb5-3b0184daa9de/resourceGroups/hchung/providers/Microsoft.RecoveryServices/vaults/hchung-testvault/backupPolicies/hchung-testpolicy"
120125

121126
# set
122-
Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName -DatabaseName $db.DatabaseName -State "Enabled" -ResourceId $policyResourceId
127+
Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName `
128+
-DatabaseName $db.DatabaseName -State "Enabled" -ResourceId $policyResourceId
123129
# get
124130
$result = Get-AzureRmSqlDatabaseBackupLongTermRetentionPolicy -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName -DatabaseName $db.DatabaseName
125131
#verify
@@ -135,7 +141,8 @@ function Test-RestoreLongTermRetentionBackup
135141
$restoredDbName = "powershell_db_restored_ltr"
136142
$recoveryPointResourceId = "/subscriptions/e5e8af86-2d93-4ebd-8eb5-3b0184daa9de/resourceGroups/hchung/providers/Microsoft.RecoveryServices/vaults/hchung-testvault/backupFabrics/Azure/protectionContainers/AzureSqlContainer;Sql;hchung;hchung-testsvr/protectedItems/AzureSqlDb;dsName;hchung-testdb;fbf5641f-77f8-43b7-8fd7-5338ec293213/recoveryPoints/1731556986347"
137143

138-
Restore-AzureRmSqlDatabase -FromLongTermRetentionBackup -ResourceId $recoveryPointResourceId -TargetDatabaseName $restoredDbName -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName
144+
Restore-AzureRmSqlDatabase -FromLongTermRetentionBackup -ResourceId $recoveryPointResourceId -TargetDatabaseName $restoredDbName `
145+
-ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName
139146
}
140147

141148
function Test-DatabaseGeoBackupPolicy

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ function Test-CreateDatabaseInternal ($serverVersion, $location = "westcentralus
3838
$databaseName = Get-DatabaseName
3939
$collationName = "SQL_Latin1_General_CP1_CI_AS"
4040
$maxSizeBytes = 250GB
41-
$strechdb = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
42-
-CollationName $collationName -MaxSizeBytes $maxSizeBytes -Edition Stretch -RequestedServiceObjectiveName DS100
41+
$job = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
42+
-CollationName $collationName -MaxSizeBytes $maxSizeBytes -Edition Stretch -RequestedServiceObjectiveName DS100 -AsJob
43+
$job | Wait-Job
44+
$strechdb = $job.Output
45+
4346
Assert-AreEqual $databaseName $strechdb.DatabaseName
4447
Assert-AreEqual $maxSizeBytes $strechdb.MaxSizeBytes
4548
Assert-AreEqual Stretch $strechdb.Edition
@@ -80,8 +83,11 @@ function Test-UpdateDatabaseInternal ($serverVersion, $location = "westcentralus
8083
-CollationName $collationName -MaxSizeBytes $maxSizeBytes -Edition Stretch -RequestedServiceObjectiveName DS100
8184

8285
# Alter stretch database properties
83-
$strechdb2 = Set-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $strechdb.DatabaseName `
84-
-MaxSizeBytes $maxSizeBytes -Edition Stretch -RequestedServiceObjectiveName DS200
86+
$job = Set-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $strechdb.DatabaseName `
87+
-MaxSizeBytes $maxSizeBytes -Edition Stretch -RequestedServiceObjectiveName DS200 -AsJob
88+
$job | Wait-Job
89+
$strechdb2 = $job.Output
90+
8591
Assert-AreEqual $strechdb.DatabaseName $strechdb2.DatabaseName
8692
Assert-AreEqual $maxSizeBytes $strechdb2.MaxSizeBytes
8793
Assert-AreEqual Stretch $strechdb2.Edition

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

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ function Test-CreateDatabaseInternal ($location = "westcentralus")
3535
{
3636
# Create with default values
3737
$databaseName = Get-DatabaseName
38-
$db = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
38+
$job1 = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -AsJob
39+
$job1 | Wait-Job
40+
$db = $job1.Output
41+
3942
Assert-AreEqual $db.DatabaseName $databaseName
4043
Assert-NotNull $db.MaxSizeBytes
4144
Assert-NotNull $db.Edition
@@ -55,8 +58,11 @@ function Test-CreateDatabaseInternal ($location = "westcentralus")
5558
$databaseName = Get-DatabaseName
5659
$collationName = "SQL_Latin1_General_CP1_CI_AS"
5760
$maxSizeBytes = 250GB
58-
$dwdb = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
59-
-CollationName $collationName -MaxSizeBytes $maxSizeBytes -Edition DataWarehouse -RequestedServiceObjectiveName DW100
61+
$job2 = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
62+
-CollationName $collationName -MaxSizeBytes $maxSizeBytes -Edition DataWarehouse -RequestedServiceObjectiveName DW100 -AsJob
63+
$job2 | Wait-Job
64+
$dwdb = $job2.Output
65+
6066
Assert-AreEqual $dwdb.DatabaseName $databaseName
6167
Assert-AreEqual $dwdb.MaxSizeBytes $maxSizeBytes
6268
Assert-AreEqual $dwdb.Edition DataWarehouse
@@ -144,8 +150,11 @@ function Test-CreateDatabaseWithZoneRedundancy
144150

145151
# Create database with no zone redundancy set
146152
$databaseName = Get-DatabaseName
147-
$db = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
148-
-DatabaseName $databaseName -Edition Premium
153+
$job = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
154+
-DatabaseName $databaseName -Edition Premium -AsJob
155+
$job | Wait-Job
156+
$db = $job.Output
157+
149158
Assert-AreEqual $db.DatabaseName $databaseName
150159
Assert-NotNull $db.Edition
151160
Assert-NotNull $db.ZoneRedundant
@@ -204,8 +213,11 @@ function Test-UpdateDatabaseInternal ($location = "westcentralus")
204213
try
205214
{
206215
# Alter all properties
207-
$db1 = Set-AzureRmSqlDatabase -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName `
208-
-MaxSizeBytes 1GB -Edition Basic -RequestedServiceObjectiveName Basic -Tags @{"tag_key"="tag_new_value"}
216+
$job = Set-AzureRmSqlDatabase -ResourceGroupName $db.ResourceGroupName -ServerName $db.ServerName -DatabaseName $db.DatabaseName `
217+
-MaxSizeBytes 1GB -Edition Basic -RequestedServiceObjectiveName Basic -Tags @{"tag_key"="tag_new_value"} -AsJob
218+
$job | Wait-Job
219+
$db1 = $job.Output
220+
209221
Assert-AreEqual $db1.DatabaseName $db.DatabaseName
210222
Assert-AreEqual $db1.MaxSizeBytes 1GB
211223
Assert-AreEqual $db1.Edition Basic
@@ -233,8 +245,11 @@ function Test-UpdateDatabaseInternal ($location = "westcentralus")
233245
$dwdb = New-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
234246
-CollationName $collationName -MaxSizeBytes $maxSizeBytes -Edition DataWarehouse -RequestedServiceObjectiveName DW100
235247

236-
$dwdb2 = Set-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $dwdb.DatabaseName `
237-
-MaxSizeBytes $maxSizeBytes -RequestedServiceObjectiveName DW200 -Edition DataWarehouse
248+
$job = Set-AzureRmSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $dwdb.DatabaseName `
249+
-MaxSizeBytes $maxSizeBytes -RequestedServiceObjectiveName DW200 -Edition DataWarehouse -AsJob
250+
$job | Wait-Job
251+
$dwdb2 = $job.Output
252+
238253
Assert-AreEqual $dwdb2.DatabaseName $dwdb.DatabaseName
239254
Assert-AreEqual $dwdb2.MaxSizeBytes $maxSizeBytes
240255
Assert-AreEqual $dwdb2.Edition DataWarehouse

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ function Test-CreateCopyInternal ($serverVersion, $location = "North Europe")
3939
try
4040
{
4141
# Create a local database copy
42-
$dbLocalCopy = New-AzureRmSqlDatabaseCopy -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $database.DatabaseName `
43-
-CopyDatabaseName $copyDatabaseName
42+
$job = New-AzureRmSqlDatabaseCopy -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $database.DatabaseName `
43+
-CopyDatabaseName $copyDatabaseName -AsJob
44+
$job | Wait-Job
45+
$dbLocalCopy = $job.Output
46+
4447
Assert-AreEqual $dbLocalCopy.ResourceGroupName $rg.ResourceGroupName
4548
Assert-AreEqual $dbLocalCopy.ServerName $server.ServerName
4649
Assert-AreEqual $dbLocalCopy.DatabaseName $database.DatabaseName
@@ -140,8 +143,9 @@ function Test-GetReplicationLinkInternal ($serverVersion, $location = "North Eur
140143
try
141144
{
142145
# Get Secondary
143-
New-AzureRmSqlDatabaseSecondary -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $database.DatabaseName `
144-
-PartnerResourceGroupName $partRg.ResourceGroupName -PartnerServerName $partServer.ServerName -AllowConnections All
146+
$job = New-AzureRmSqlDatabaseSecondary -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $database.DatabaseName `
147+
-PartnerResourceGroupName $partRg.ResourceGroupName -PartnerServerName $partServer.ServerName -AllowConnections All -AsJob
148+
$job | Wait-Job
145149

146150
$secondary = Get-AzureRmSqlDatabaseReplicationLink -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
147151
-DatabaseName $database.DatabaseName -PartnerResourceGroupName $partRg.ResourceGroupName -PartnerServerName $partServer.ServerName
@@ -237,7 +241,8 @@ function Test-FailoverSecondaryDatabaseInternal ($serverVersion, $location = "No
237241

238242
$secondary = Get-AzureRmSqlDatabaseReplicationLink -ResourceGroupName $partRg.ResourceGroupName -ServerName $partServer.ServerName -DatabaseName $database.DatabaseName -PartnerResourceGroupName $rg.ResourceGroupName -PartnerServerName $server.ServerName
239243

240-
$secondary | Set-AzureRmSqlDatabaseSecondary -PartnerResourceGroupName $rg.ResourceGroupName -Failover
244+
$job = $secondary | Set-AzureRmSqlDatabaseSecondary -PartnerResourceGroupName $rg.ResourceGroupName -Failover -AsJob
245+
$job | Wait-Job
241246
}
242247
finally
243248
{

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ function Test-CreateElasticPool
2626
{
2727
# Create a pool with all values
2828
$poolName = Get-ElasticPoolName
29-
$ep1 = New-AzureRmSqlElasticPool -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName `
30-
-ElasticPoolName $poolName -Edition Standard -Dtu 200 -DatabaseDtuMin 10 -DatabaseDtuMax 100 -StorageMB 204800
29+
$job = New-AzureRmSqlElasticPool -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName `
30+
-ElasticPoolName $poolName -Edition Standard -Dtu 200 -DatabaseDtuMin 10 -DatabaseDtuMax 100 -StorageMB 204800 -AsJob
31+
$job | Wait-Job
32+
$ep1 = $job.Output
33+
3134
Assert-NotNull $ep1
3235
Assert-AreEqual 200 $ep1.Dtu
3336
Assert-AreEqual 204800 $ep1.StorageMB
@@ -108,8 +111,11 @@ function Test-UpdateElasticPool
108111
try
109112
{
110113
# Create a pool with all values
111-
$sep1 = Set-AzureRmSqlElasticPool -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName `
112-
-ElasticPoolName $ep1.ElasticPoolName -Dtu 400 -DatabaseDtuMin 0 -DatabaseDtuMax 50 -Edition Standard -StorageMB 409600
114+
$job = Set-AzureRmSqlElasticPool -ServerName $server.ServerName -ResourceGroupName $rg.ResourceGroupName `
115+
-ElasticPoolName $ep1.ElasticPoolName -Dtu 400 -DatabaseDtuMin 0 -DatabaseDtuMax 50 -Edition Standard -StorageMB 409600 -AsJob
116+
$job | Wait-Job
117+
$sep1 = $job.Output
118+
113119
Assert-NotNull $sep1
114120
Assert-AreEqual 400 $sep1.Dtu
115121
Assert-AreEqual 409600 $sep1.StorageMB

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,10 @@ function Test-SwitchFailoverGroup()
367367
Handle-FailoverGroupTestWithFailoverGroup {
368368
Param($fg)
369369

370-
Get-AzureRmSqlDatabaseFailoverGroup $fg.PartnerResourceGroupName $fg.PartnerServerName $fg.FailoverGroupName | Switch-AzureRmSqlDatabaseFailoverGroup
370+
$foGroup = Get-AzureRmSqlDatabaseFailoverGroup $fg.PartnerResourceGroupName $fg.PartnerServerName $fg.FailoverGroupName
371+
$job = $foGroup | Switch-AzureRmSqlDatabaseFailoverGroup -AsJob
372+
$job | Wait-Job
373+
371374
$newSecondaryFg = $fg | Get-AzureRmSqlDatabaseFailoverGroup
372375
Assert-FailoverGroupsEqual $fg $newSecondaryFg -role "Secondary"
373376
Validate-FailoverGroupWithGet $newSecondaryFg

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@ function Test-GetServerCommunicationLink
5555
$server2 = Create-ServerForTest $rg $locationOverride
5656

5757
$linkName = Get-ElasticPoolName
58-
$ep1 = New-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
59-
-LinkName $linkName -PartnerServer $server2.ServerName
58+
$job = New-AzureRmSqlServerCommunicationLink -ServerName $server1.ServerName -ResourceGroupName $rg.ResourceGroupName `
59+
-LinkName $linkName -PartnerServer $server2.ServerName -AsJob
60+
$job | Wait-Job
61+
$ep1 = $job.Output
62+
6063
Assert-NotNull $ep1
6164
Assert-AreEqual $linkName $ep1.Name
6265
Assert-AreEqual $server2.ServerName $ep1.PartnerServer

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ function Test-CreateServer
3030
try
3131
{
3232
# With all parameters
33-
$server1 = New-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -Location $rg.Location -ServerVersion $version -SqlAdministratorCredentials $credentials
33+
$job = New-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName `
34+
-Location $rg.Location -ServerVersion $version -SqlAdministratorCredentials $credentials -AsJob
35+
$job | Wait-Job
36+
$server1 = $job.Output
37+
3438
Assert-AreEqual $server1.ServerName $serverName
3539
Assert-AreEqual $server1.ServerVersion $version
3640
Assert-AreEqual $server1.SqlAdministratorLogin $serverLogin
@@ -57,7 +61,9 @@ function Test-UpdateServer
5761
$serverPassword = "n3wc00lP@55w0rd"
5862
$secureString = ConvertTo-SecureString $serverPassword -AsPlainText -Force
5963

60-
$server1 = Set-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -SqlAdministratorPassword $secureString
64+
$server1 = Set-AzureRmSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName `
65+
-SqlAdministratorPassword $secureString
66+
6167
Assert-AreEqual $server1.ServerName $server.ServerName
6268
Assert-AreEqual $server1.ServerVersion $server.ServerVersion
6369
Assert-AreEqual $server1.SqlAdministratorLogin $server.SqlAdministratorLogin

0 commit comments

Comments
 (0)