diff --git a/src/ADDomainServices/ADDomainServices.Autorest/test/Remove-AzADDomainService.Tests.ps1 b/src/ADDomainServices/ADDomainServices.Autorest/test/Remove-AzADDomainService.Tests.ps1 index 62f5119bdb6d..0c2b611582eb 100644 --- a/src/ADDomainServices/ADDomainServices.Autorest/test/Remove-AzADDomainService.Tests.ps1 +++ b/src/ADDomainServices/ADDomainServices.Autorest/test/Remove-AzADDomainService.Tests.ps1 @@ -21,7 +21,7 @@ Describe 'Remove-AzADDomainService' { It 'DeleteViaIdentity' { $ReplicaSet = New-AzADDomainServiceReplicaSetObject -Location $env.Location -SubnetId $env.SubnetId $NewAdDomain = New-AzADDomainService -name $env.ADdomainName -ResourceGroupName $env.ResourceGroupName -DomainName $env.ADDomainNameCom -ReplicaSet $ReplicaSet - # Start-Sleep -s 120 + Start-TestSleep 120 $GetADDomainExample = Get-AzADDomainService -ResourceGroupName $env.ResourceGroupName -Name $env.ADdomainName Remove-AzADDomainService -InputObject $GetADDomainExample $GetADDomainList = Get-AzADDomainService diff --git a/src/ADDomainServices/ADDomainServices.Autorest/test/Update-AzADDomainService.Tests.ps1 b/src/ADDomainServices/ADDomainServices.Autorest/test/Update-AzADDomainService.Tests.ps1 index b4fa7bda5179..09a1d7fae659 100644 --- a/src/ADDomainServices/ADDomainServices.Autorest/test/Update-AzADDomainService.Tests.ps1 +++ b/src/ADDomainServices/ADDomainServices.Autorest/test/Update-AzADDomainService.Tests.ps1 @@ -18,7 +18,7 @@ Describe 'Update-AzADDomainService' { } It 'UpdateViaIdentityExpanded' { - # Start-Sleep -s 240 + Start-TestSleep 240 $GetADDomainExample = Get-AzADDomainService -ResourceGroupName $env.ResourceGroupName -Name $env.ADdomainName $UpdateADDomain = Update-AzADDomainService -InputObject $GetADDomainExample -DomainSecuritySettingTlsV1 $env.TlsV1Status2 $UpdateADDomain.DomainSecuritySettingTlsV1 | Should -Be $env.TlsV1Status2 diff --git a/src/DataMigration/DataMigration.Autorest/test/Remove-AzDataMigrationToSqlDb.Tests.ps1 b/src/DataMigration/DataMigration.Autorest/test/Remove-AzDataMigrationToSqlDb.Tests.ps1 index 374d818e344f..26c7b216457a 100644 --- a/src/DataMigration/DataMigration.Autorest/test/Remove-AzDataMigrationToSqlDb.Tests.ps1 +++ b/src/DataMigration/DataMigration.Autorest/test/Remove-AzDataMigrationToSqlDb.Tests.ps1 @@ -20,16 +20,16 @@ Describe 'Remove-AzDataMigrationToSqlDb' { $sourcePassword = ConvertTo-SecureString $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionPassword -AsPlainText -Force $instance = New-AzDataMigrationToSqlDb -ResourceGroupName $env.TestDeleteDatabaseMigrationDb.ResourceGroupName -SqlDbInstanceName $env.TestDeleteDatabaseMigrationDb.SqlDbInstanceName -MigrationService $env.TestDeleteDatabaseMigrationDb.MigrationService -TargetSqlConnectionAuthentication $env.TestDeleteDatabaseMigrationDb.TargetSqlConnectionAuthentication -TargetSqlConnectionDataSource $env.TestDeleteDatabaseMigrationDb.TargetSqlConnectionDataSource -TargetSqlConnectionPassword $targetPassword -TargetSqlConnectionUserName $env.TestDeleteDatabaseMigrationDb.TargetSqlConnectionUserName -SourceSqlConnectionAuthentication $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionAuthentication -SourceSqlConnectionDataSource $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionDataSource -SourceSqlConnectionUserName $env.TestDeleteDatabaseMigrationDb.SourceSqlConnectionUserName -SourceSqlConnectionPassword $sourcePassword -SourceDatabaseName $env.TestDeleteDatabaseMigrationDb.SourceDatabaseName -TargetDbName $env.TestDeleteDatabaseMigrationDb.TargetDbName -Scope $env.TestDeleteDatabaseMigrationDb.Scope - - Start-Sleep -Seconds 5 + + Start-TestSleep -Seconds 5 Remove-AzDataMigrationToSqlDb -ResourceGroupName $env.TestDeleteDatabaseMigrationDb.ResourceGroupName -SqlDbInstanceName $env.TestDeleteDatabaseMigrationDb.SqlDbInstanceName -TargetDbName $env.TestDeleteDatabaseMigrationDb.TargetDbName -Force - Start-Sleep -Seconds 5 - - + Start-TestSleep -Seconds 5 + + $dbMig = Get-AzDataMigrationToSqlDb -ResourceGroupName $env.TestDeleteDatabaseMigrationDb.ResourceGroupName -SqlDbInstanceName $env.TestDeleteDatabaseMigrationDb.SqlDbInstanceName -TargetDbName $env.TestDeleteDatabaseMigrationDb.TargetDbName -ErrorAction SilentlyContinue - + $assert = ($dbMig -eq $null) $assert | Should be $true diff --git a/src/DataProtection/DataProtection.Autorest/test/Backup-AzDataProtectionBackupInstanceAdhoc.Tests.ps1 b/src/DataProtection/DataProtection.Autorest/test/Backup-AzDataProtectionBackupInstanceAdhoc.Tests.ps1 index b60376971826..cee87410f576 100644 --- a/src/DataProtection/DataProtection.Autorest/test/Backup-AzDataProtectionBackupInstanceAdhoc.Tests.ps1 +++ b/src/DataProtection/DataProtection.Autorest/test/Backup-AzDataProtectionBackupInstanceAdhoc.Tests.ps1 @@ -28,7 +28,7 @@ Describe 'Backup-AzDataProtectionBackupInstanceAdhoc' { $jobstatus = "InProgress" while($jobstatus -eq "InProgress") { - Start-Sleep -Seconds 5 + Start-TestSleep -Seconds 5 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } @@ -38,21 +38,21 @@ Describe 'Backup-AzDataProtectionBackupInstanceAdhoc' { It 'OssBackup' { # Test trigger Backup for Oss DB - # Delete this test + # Delete this test $sub = $env.TestOssBackupScenario.SubscriptionId $rgName = $env.TestOssBackupScenario.ResourceGroupName $vaultName = $env.TestOssBackupScenario.VaultName - $policyName = $env.TestOssBackupScenario.PolicyName + $policyName = $env.TestOssBackupScenario.PolicyName $dataSourceId = $env.TestOssBackupScenario.OssDbId $serverName = $env.TestOssBackupScenario.OssServerName $keyVault = $env.TestOssBackupScenario.KeyVault $secretURI = $env.TestOssBackupScenario.SecretURI - + $vault = Get-AzDataProtectionBackupVault -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $policy = Get-AzDataProtectionBackupPolicy -SubscriptionId $sub -VaultName $vaultName -ResourceGroupName $rgName | where {$_.Name -eq $policyName} $instance = Get-AzDataProtectionBackupInstance -Subscription $sub -ResourceGroup $rgName -Vault $vaultName | Where-Object {($_.Property.DataSourceInfo.Type -eq "Microsoft.DBforPostgreSQL/servers/databases") -and ($_.Property.DataSourceInfo.ResourceId -match $serverName)} - + ($instance -ne $null) | Should be $true $backupJob = Backup-AzDataProtectionBackupInstanceAdhoc -BackupInstanceName $instance.Name -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName -BackupRuleOptionRuleName $policy.Property.PolicyRule[0].Name -TriggerOptionRetentionTagOverride $policy.Property.PolicyRule[0].Trigger.TaggingCriterion[0].TagInfoTagName @@ -61,7 +61,7 @@ Describe 'Backup-AzDataProtectionBackupInstanceAdhoc' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } diff --git a/src/DataProtection/DataProtection.Autorest/test/BlobHardeningScenario.Tests.ps1 b/src/DataProtection/DataProtection.Autorest/test/BlobHardeningScenario.Tests.ps1 index 0e31edeab58a..5c79d447da8a 100644 --- a/src/DataProtection/DataProtection.Autorest/test/BlobHardeningScenario.Tests.ps1 +++ b/src/DataProtection/DataProtection.Autorest/test/BlobHardeningScenario.Tests.ps1 @@ -23,7 +23,7 @@ Describe 'BlobHardeningScenario' { $vault = Get-AzDataProtectionBackupVault -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName $pol = Get-AzDataProtectionBackupPolicy -SubscriptionId $subId -VaultName $vaultName -ResourceGroupName $resourceGroupName | Where { $_.Name -match $policyName } - + $instance = Get-AzDataProtectionBackupInstance -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName | Where { $_.Name -match $storageAcountName } # Remove-BI @@ -31,26 +31,26 @@ Describe 'BlobHardeningScenario' { Remove-AzDataProtectionBackupInstance -Name $instance[0].Name -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName } - Start-Sleep -Seconds 8 + Start-TestSleep -Seconds 8 # new backup config and initialize BI - - $storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName + + $storageAccount = Get-AzStorageAccount -ResourceGroupName $resourceGroupName -Name $storageAccountName $containers=Get-AzStorageContainer -Context $storageAccount.Context - - $backupConfig = New-AzDataProtectionBackupConfigurationClientObject -DatasourceType AzureBlob -VaultedBackupContainer $containers.Name + + $backupConfig = New-AzDataProtectionBackupConfigurationClientObject -DatasourceType AzureBlob -VaultedBackupContainer $containers.Name $backupConfig.ContainersList = $backupConfig.ContainersList[1,3,4] $backupInstanceClientObject = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureBlob -DatasourceLocation $vault.Location -PolicyId $pol[0].Id -DatasourceId $storageAccId -BackupConfiguration $backupConfig - # assign permissions and validate + # assign permissions and validate Set-AzDataProtectionMSIPermission -VaultResourceGroup $resourceGroupName -VaultName $vaultName -BackupInstance $backupInstanceClientObject -PermissionsScope ResourceGroup $operationResponse = Test-AzDataProtectionBackupInstanceReadiness -ResourceGroupName $resourceGroupName -VaultName $vaultName -SubscriptionId $subId -BackupInstance $backupInstanceClientObject.Property -NoWait $operationId = $operationResponse.Target.Split("/")[-1].Split("?")[0] - + While((Get-AzDataProtectionOperationStatus -OperationId $operationId -Location $vault.Location -SubscriptionId $subId).Status -eq "Inprogress"){ - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 } # backup @@ -59,7 +59,7 @@ Describe 'BlobHardeningScenario' { $instance = Get-AzDataProtectionBackupInstance -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName | Where { $_.Name -match $storageAcountName } while($instance.Property.CurrentProtectionState -ne "ProtectionConfigured"){ - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $instance = Get-AzDataProtectionBackupInstance -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName | Where { $_.Name -match $storageAcountName } } @@ -74,15 +74,15 @@ Describe 'BlobHardeningScenario' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName $jobstatus = $currentjob.Status } - $jobstatus | Should be "Completed" + $jobstatus | Should be "Completed" } It 'TriggerRestore' -skip { - # TODO: OLR should throw an error in case of vaulted backups + # TODO: OLR should throw an error in case of vaulted backups $subId = $env.TestBlobHardeningScenario.SubscriptionId $crossSubscriptionId = $env.TestBlobHardeningScenario.CrossSubscriptionId @@ -112,7 +112,7 @@ Describe 'BlobHardeningScenario' { foreach($crossSubContainerName in $targetCrossSubContainers.Name){ Remove-AzStorageContainer -Context $targetCrossSubStorageAccount.Context -Name $crossSubContainerName -Confirm:$false -Force } - + # remove containers in target storage account Set-AzContext -SubscriptionId $subId $targetStorageAccount = Get-AzStorageAccount -ResourceGroupName $targetStorageAccountRGName -Name $targetStorageAccountName @@ -128,7 +128,7 @@ Describe 'BlobHardeningScenario' { $validateRestore.ObjectType | Should be "OperationJobExtendedInfo" $restoreJob = Start-AzDataProtectionBackupInstanceRestore -SubscriptionId $subId -ResourceGroupName $resourceGroupName -VaultName $vaultName -BackupInstanceName $instance.BackupInstanceName -Parameter $restoreReq - + $restoreReqCSR = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureBlob -SourceDataStore VaultStore -RestoreLocation $vault.Location -RecoveryPoint $rp[0].Name -ItemLevelRecovery -RestoreType AlternateLocation -TargetResourceId $targetCrossSubStorageAccId -ContainersList $backedUpContainers[0,1] $validateRestore = Test-AzDataProtectionBackupInstanceRestore -Name $instance[0].Name -ResourceGroupName $resourceGroupName -SubscriptionId $subId -VaultName $vaultName -RestoreRequest $restoreReqCSR diff --git a/src/DataProtection/DataProtection.Autorest/test/DiskBackupScenario.Tests.ps1 b/src/DataProtection/DataProtection.Autorest/test/DiskBackupScenario.Tests.ps1 index 009c84c51f95..c158c1099b66 100644 --- a/src/DataProtection/DataProtection.Autorest/test/DiskBackupScenario.Tests.ps1 +++ b/src/DataProtection/DataProtection.Autorest/test/DiskBackupScenario.Tests.ps1 @@ -15,7 +15,7 @@ Describe 'DiskBackupScenario' { It 'EndtoEndTest' { $vaultName = $env.TestDiskBackupScenario.VaultName $rgName = $env.TestDiskBackupScenario.ResourceGroupName - $diskId = $env.TestDiskBackupScenario.DiskId + $diskId = $env.TestDiskBackupScenario.DiskId $snapshotRg = $env.TestDiskBackupScenario.SnapshotRG $restoreDiskId = $env.TestDiskBackupScenario.RestoreDiskId $policyName = $env.TestDiskBackupScenario.NewPolicyName @@ -25,7 +25,7 @@ Describe 'DiskBackupScenario' { $defaultPolicy = Get-AzDataProtectionPolicyTemplate -DatasourceType AzureDisk $policyId = "/subscriptions/" + $sub + "/resourceGroups/" + $rgName + "/providers/Microsoft.DataProtection/backupVaults/" + $vaultName + "/backupPolicies/" + $policyName $backupInstance = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureDisk -DatasourceLocation centraluseuap -PolicyId $policyId -DatasourceId $diskId -SnapshotResourceGroupId $snapshotRg - + $instances = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $instance = $instances | where-Object {$_.Property.DataSourceInfo.ResourceId -eq $diskId} $backupInstanceName = $instance.Name @@ -34,7 +34,7 @@ Describe 'DiskBackupScenario' { $protectionStatus = $instance.Property.ProtectionStatus.Status while($protectionStatus -ne "ProtectionConfigured") { - Start-Sleep -Seconds 5 + Start-TestSleep -Seconds 5 $instance = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName -Name $backupInstanceName $protectionStatus = $instance.Property.ProtectionStatus.Status @@ -42,16 +42,16 @@ Describe 'DiskBackupScenario' { # configure backup if not configured } - $backupPolicyId = $instance.Property.PolicyInfo.PolicyId + $backupPolicyId = $instance.Property.PolicyInfo.PolicyId $policy = Get-AzDataProtectionBackupPolicy -SubscriptionId $sub -VaultName $vaultName -ResourceGroupName $rgName | Where-Object { $_.Id -eq $backupPolicyId } - + $job = Backup-AzDataProtectionBackupInstanceAdhoc -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName -BackupInstanceName $backupInstanceName -BackupRuleOptionRuleName $policy.Property.PolicyRule[0].Name -TriggerOptionRetentionTagOverride $policy.Property.PolicyRule[0].Trigger.TaggingCriterion[0].TagInfoTagName $jobid = $job.JobId.Split("/")[-1] $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 5 + Start-TestSleep -Seconds 5 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } @@ -64,7 +64,7 @@ Describe 'DiskBackupScenario' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 5 + Start-TestSleep -Seconds 5 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } diff --git a/src/DataProtection/DataProtection.Autorest/test/Initialize-AzDataProtectionRestoreRequest.Tests.ps1 b/src/DataProtection/DataProtection.Autorest/test/Initialize-AzDataProtectionRestoreRequest.Tests.ps1 index 41ee5806bb68..6843dae21034 100644 --- a/src/DataProtection/DataProtection.Autorest/test/Initialize-AzDataProtectionRestoreRequest.Tests.ps1 +++ b/src/DataProtection/DataProtection.Autorest/test/Initialize-AzDataProtectionRestoreRequest.Tests.ps1 @@ -16,26 +16,26 @@ Describe 'Initialize-AzDataProtectionRestoreRequest' { $sub = $env.TestBlobsRestore.SubscriptionId $rgName = $env.TestBlobsRestore.ResourceGroupName $vaultName = $env.TestBlobsRestore.VaultName - + # $Debug preference = "Continue" Write-Debug -Message $sub Write-Debug -Message $rgName Write-Debug -Message $vaultName $instances = Get-AzDataProtectionBackupInstance -Subscription $sub -ResourceGroup $rgName -Vault $vaultName | Where-Object {($_.Property.DataSourceInfo.Type -eq "Microsoft.Storage/storageAccounts/blobServices") -and ($_.Property.CurrentProtectionState -eq "ProtectionConfigured")} - + if($instances.Count -gt 0){ - + $pointInTimeRange = Find-AzDataProtectionRestorableTimeRange -BackupInstanceName $instances[0].BackupInstanceName -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName -SourceDataStoreType OperationalStore -StartTime (Get-Date).AddDays(-30).ToString("yyyy-MM-ddTHH:mm:ss.0000000Z") -EndTime (Get-Date).AddDays(0).ToString("yyyy-MM-ddTHH:mm:ss.0000000Z") $vault = Get-AzDataProtectionBackupVault -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName $BlobResReq = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureBlob -SourceDataStore OperationalStore -RestoreLocation $vault.Location -RestoreType OriginalLocation -BackupInstance $instances[0] -PointInTime (Get-Date -Date $pointInTimeRange.RestorableTimeRange.EndTime) - $restoreJob = Start-AzDataProtectionBackupInstanceRestore -BackupInstanceName $instances[0].BackupInstanceName -ResourceGroupName $rgName -VaultName $vaultName -SubscriptionId $sub -Parameter $BlobResReq + $restoreJob = Start-AzDataProtectionBackupInstanceRestore -BackupInstanceName $instances[0].BackupInstanceName -ResourceGroupName $rgName -VaultName $vaultName -SubscriptionId $sub -Parameter $BlobResReq $jobid = $restoreJob.JobId.Split("/")[-1] $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } diff --git a/src/DataProtection/DataProtection.Autorest/test/New-AzDataProtectionBackupInstance.Tests.ps1 b/src/DataProtection/DataProtection.Autorest/test/New-AzDataProtectionBackupInstance.Tests.ps1 index 08e34e234817..0fd329c3452a 100644 --- a/src/DataProtection/DataProtection.Autorest/test/New-AzDataProtectionBackupInstance.Tests.ps1 +++ b/src/DataProtection/DataProtection.Autorest/test/New-AzDataProtectionBackupInstance.Tests.ps1 @@ -16,17 +16,17 @@ Describe 'New-AzDataProtectionBackupInstance' { $sub = $env.TestOssBackupScenario.SubscriptionId $rgName = $env.TestOssBackupScenario.ResourceGroupName $vaultName = $env.TestOssBackupScenario.VaultName - $policyName = $env.TestOssBackupScenario.PolicyName + $policyName = $env.TestOssBackupScenario.PolicyName $dataSourceId = $env.TestOssBackupScenario.OssDbId $serverName = $env.TestOssBackupScenario.OssServerName $keyVault = $env.TestOssBackupScenario.KeyVault $secretURI = $env.TestOssBackupScenario.SecretURI - + $vault = Get-AzDataProtectionBackupVault -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $policy = Get-AzDataProtectionBackupPolicy -SubscriptionId $sub -VaultName $vaultName -ResourceGroupName $rgName | where {$_.Name -eq $policyName} - + $instance = Get-AzDataProtectionBackupInstance -Subscription $sub -ResourceGroup $rgName -Vault $vaultName | Where-Object {($_.Property.DataSourceInfo.Type -eq "Microsoft.DBforPostgreSQL/servers/databases") -and ($_.Property.DataSourceInfo.ResourceId -match $serverName)} - + if($instance -eq $null){ # will come here only if the instance is not protected (ideally won't come here') # remove command for backup instance below @@ -38,7 +38,7 @@ Describe 'New-AzDataProtectionBackupInstance' { } $instance = Get-AzDataProtectionBackupInstance -Subscription $sub -ResourceGroup $rgName -Vault $vaultName | Where-Object {($_.Property.DataSourceInfo.Type -eq "Microsoft.DBforPostgreSQL/servers/databases") -and ($_.Property.DataSourceInfo.ResourceId -match $serverName)} - + ($instance -ne $null) | Should be $true } @@ -53,9 +53,9 @@ Describe 'New-AzDataProtectionBackupInstance' { $snapshotResourceGroupId = $env.TestAksRestoreScenario.SnapshotResourceGroupId $friendlyName = $env.TestAksRestoreScenario.FriendlyName $clusterName = $env.TestAksRestoreScenario.ClusterName - - $vault = Get-AzDataProtectionBackupVault -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName - $backupInstance = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName | Where { $_.Name -match $clusterName } + + $vault = Get-AzDataProtectionBackupVault -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName + $backupInstance = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName | Where { $_.Name -match $clusterName } $policy = Get-AzDataProtectionBackupPolicy -SubscriptionId $sub -VaultName $vaultName -ResourceGroupName $rgName | where {$_.Name -eq $policyName} # remove permissions @@ -63,47 +63,47 @@ Describe 'New-AzDataProtectionBackupInstance' { # if($backupInstance -ne $null){ # Remove-azdataProtectionBackupInstance -ResourceGroupName $rgName -VaultName $vaultName -SubscriptionId $sub -Name $backupInstance.BackupInstanceName # } - # + # # $roles = Get-AzRoleAssignment -ObjectId $vault.Identity.PrincipalId # foreach ($role in $roles){ # Remove-AzRoleAssignment -ObjectId $vault.Identity.PrincipalId -RoleDefinitionName $role.RoleDefinitionName -Scope $role.Scope # } - # - # $aksCluster = Get-AzAksCluster -Id $backupInstance.Property.DataSourceInfo.ResourceId -SubscriptionId $sub + # + # $aksCluster = Get-AzAksCluster -Id $backupInstance.Property.DataSourceInfo.ResourceId -SubscriptionId $sub # $dataSourceMSIRoles = Az.Resources\Get-AzRoleAssignment -ObjectId $aksCluster.Identity.PrincipalId # Remove-AzRoleAssignment -ObjectId $aksCluster.Identity.PrincipalId -RoleDefinitionName "Contributor" -Scope $snapshotResourceGroupId - # configure backup + # configure backup # if($backupInstance -eq $null){ # $backupConfig = New-AzDataProtectionBackupConfigurationClientObject -SnapshotVolume $true -IncludeClusterScopeResource $true -DatasourceType AzureKubernetesService # -LabelSelector "x=y","foo=bar" # $backupInstance = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureKubernetesService -DatasourceLocation $dataSourceLocation -PolicyId $policy.Id -DatasourceId $sourceClusterId -SnapshotResourceGroupId $snapshotResourceGroupId -FriendlyName $friendlyName -BackupConfiguration $backupConfig - + ## set MSI permissions # Set-AzDataProtectionMSIPermission -BackupInstance $backupInstance -VaultResourceGroup $rgName -VaultName $vaultName -PermissionsScope "ResourceGroup" ## enable protection # $tag= @{"MABUsed"="Yes";"Owner"="hiaga";"Purpose"="Testing";"DeleteBy"="06-2027"} - # $biCreate = New-AzDataProtectionBackupInstance -ResourceGroupName $rgName -VaultName $vaultName -BackupInstance $backupInstance -SubscriptionId $sub -Tag $tag + # $biCreate = New-AzDataProtectionBackupInstance -ResourceGroupName $rgName -VaultName $vaultName -BackupInstance $backupInstance -SubscriptionId $sub -Tag $tag # } - + # validate bi created $backupInstance = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName | Where { $_.Name -match $clusterName } ($backupInstance -ne $null) | Should be $true - + while($backupInstance.Property.ProtectionStatus.Status -ne "ProtectionConfigured") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $backupInstance = Get-AzDataProtectionBackupInstance -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName | Where { $_.Name -match $clusterName } } # adhoc backup Backup-AzDataProtectionBackupInstanceAdhoc -BackupInstanceName $backupInstance.BackupInstanceName -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName -BackupRuleOptionRuleName $policy.Property.PolicyRule[0].Name -TriggerOptionRetentionTagOverride $policy.Property.PolicyRule[0].Trigger.TaggingCriterion[0].TagInfoTagName - - Start-Sleep -Seconds 30 + + Start-TestSleep -Seconds 30 # get recovery point - $rps = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $backupInstance.BackupInstanceName -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName + $rps = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $backupInstance.BackupInstanceName -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName # restore if($rps -ne $null){ @@ -116,18 +116,18 @@ Describe 'New-AzDataProtectionBackupInstance' { $validateRestore = Test-AzDataProtectionBackupInstanceRestore -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName -RestoreRequest $aksRestoreRequest -Name $backupInstance.BackupInstanceName $validateRestore.ObjectType | Should be "OperationJobExtendedInfo" - + $restoreJob = Start-AzDataProtectionBackupInstanceRestore -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName -BackupInstanceName $backupInstance.BackupInstanceName -Parameter $aksRestoreRequest - Start-Sleep -Seconds 10 - + Start-TestSleep -Seconds 10 + $jobid = $restoreJob.JobId.Split("/")[-1] ($jobid -ne $null) | Should be $true $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } diff --git a/src/DataProtection/DataProtection.Autorest/test/Set-AzDataProtectionMSIPermission.Tests.ps1 b/src/DataProtection/DataProtection.Autorest/test/Set-AzDataProtectionMSIPermission.Tests.ps1 index de87c56feca3..6c08160ccbbf 100644 --- a/src/DataProtection/DataProtection.Autorest/test/Set-AzDataProtectionMSIPermission.Tests.ps1 +++ b/src/DataProtection/DataProtection.Autorest/test/Set-AzDataProtectionMSIPermission.Tests.ps1 @@ -24,61 +24,61 @@ Describe 'Set-AzDataProtectionMSIPermission' { $DiskPolicyName = $env.TestGrantPermission.DiskPolicyName $Diskrg = $env.TestGrantPermission.Diskrg - $sub = (Get-AzContext).Subscription.Id + $sub = (Get-AzContext).Subscription.Id Set-AzContext -SubscriptionId $SubscriptionId - $TestBkpVault = Get-AzDataProtectionBackupVault -ResourceGroupName $VaultRG -VaultName $VaultName - + $TestBkpVault = Get-AzDataProtectionBackupVault -ResourceGroupName $VaultRG -VaultName $VaultName + $policyDefn = Get-AzDataProtectionPolicyTemplate -DatasourceType AzureDisk New-AzDataProtectionBackupPolicy -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -Name $DiskPolicyName -Policy $policyDefn $diskBkpPol = Get-AzDataProtectionBackupPolicy -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -Name $DiskPolicyName - + $instance = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureDisk -DatasourceLocation $TestBkpvault.Location -PolicyId $diskBkpPol[0].Id -DatasourceId $DiskId $instance.Property.PolicyInfo.PolicyParameter.DataStoreParametersList[0].ResourceGroupId = $Snapshotrg - + #Validation should fail try {Test-AzDataProtectionBackupInstanceReadiness -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -BackupInstance $instance[0].Property} - + catch - { + { $err = $_ $check = $err.Exception.Message.Contains("permissions") ($check -eq $true) | Should be $true Set-AzDataProtectionMSIPermission -BackupInstance $instance -VaultResourceGroup $VaultRG -VaultName $TestBkpVault.Name -PermissionsScope "ResourceGroup" #Validation should succeed - Start-Sleep -Seconds 30 + Start-TestSleep -Seconds 30 $After = Test-AzDataProtectionBackupInstanceReadiness -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -BackupInstance $instance[0].Property ($After -ne $null) | Should be $true Remove-AzRoleAssignment -ObjectId $TestBkpVault.IdentityPrincipalId -RoleDefinitionName "Disk Backup Reader" -Scope $Diskrg - } + } Set-AzContext -SubscriptionId $sub } It 'BlobGrantPermission' -skip { $VaultName = $env.TestGrantPermission.VaultName $VaultRG = $env.TestGrantPermission.VaultRG - $BlobPolicyName = $env.TestGrantPermission.BlobPolicyName + $BlobPolicyName = $env.TestGrantPermission.BlobPolicyName $BlobId = $env.TestGrantPermission.BlobId $Blobrg = $env.TestGrantPermission.Blobrg $SubscriptionId = $env.TestGrantPermission.SubscriptionId - $sub = (Get-AzContext).Subscription.Id + $sub = (Get-AzContext).Subscription.Id Set-AzContext -SubscriptionId $SubscriptionId $TestBkpVault = Get-AzDataProtectionBackupVault -ResourceGroupName $VaultRG -VaultName $VaultName - + $policyDefn = Get-AzDataProtectionPolicyTemplate -DatasourceType AzureBlob - + New-AzDataProtectionBackupPolicy -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -Name blobBkpPolicy -Policy $policyDefn $blobBkpPol = Get-AzDataProtectionBackupPolicy -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -Name $BlobPolicyName $instance = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureBlob -DatasourceLocation $TestBkpvault.Location -PolicyId $blobBkpPol[0].Id -DatasourceId $BlobId - + #Validation should fail try {Test-AzDataProtectionBackupInstanceReadiness -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -BackupInstance $instance[0].Property} @@ -88,9 +88,9 @@ Describe 'Set-AzDataProtectionMSIPermission' { $check = $err.Exception.Message.Contains("permissions") ($check -eq $true) | Should be $true - Set-AzDataProtectionMSIPermission -BackupInstance $instance -VaultResourceGroup $VaultRG -VaultName $TestBkpVault.Name -PermissionsScope "ResourceGroup" + Set-AzDataProtectionMSIPermission -BackupInstance $instance -VaultResourceGroup $VaultRG -VaultName $TestBkpVault.Name -PermissionsScope "ResourceGroup" - Start-Sleep -Seconds 30 + Start-TestSleep -Seconds 30 #Validation should succeed $After = Test-AzDataProtectionBackupInstanceReadiness -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -BackupInstance $instance[0].Property ($After -ne $null) | Should be $true @@ -111,16 +111,16 @@ Describe 'Set-AzDataProtectionMSIPermission' { $ossrg = $env.TestGrantPermission.Ossrg $SubscriptionId = $env.TestGrantPermission.SubscriptionId - $sub = (Get-AzContext).Subscription.Id + $sub = (Get-AzContext).Subscription.Id Set-AzContext -SubscriptionId $SubscriptionId $TestBkpVault = Get-AzDataProtectionBackupVault -ResourceGroupName $VaultRG -VaultName $VaultName - + $policyDefn = Get-AzDataProtectionPolicyTemplate -DatasourceType AzureDatabaseForPostgreSQL $polOss = New-AzDataProtectionBackupPolicy -ResourceGroupName $VaultRG -VaultName $VaultName -Name $OssPolicyName -Policy $policyDefn - $instance = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureDatabaseForPostgreSQL -DatasourceLocation $TestBkpvault.Location -PolicyId $polOss[0].Id -DatasourceId $ossId -SecretStoreURI $keyURI -SecretStoreType AzureKeyVault - + $instance = Initialize-AzDataProtectionBackupInstance -DatasourceType AzureDatabaseForPostgreSQL -DatasourceLocation $TestBkpvault.Location -PolicyId $polOss[0].Id -DatasourceId $ossId -SecretStoreURI $keyURI -SecretStoreType AzureKeyVault + #Validation should fail try { @@ -132,10 +132,10 @@ Describe 'Set-AzDataProtectionMSIPermission' { $err = $_ $check = $err.Exception.Message.Contains("permissions") ($check -eq $true) | Should be $true - + Set-AzDataProtectionMSIPermission -KeyVaultId $KeyVaultId -BackupInstance $instance -VaultResourceGroup $VaultRG -VaultName $TestBkpVault.Name -PermissionsScope "ResourceGroup" -Confirm:$false - - Start-Sleep -Seconds 30 + + Start-TestSleep -Seconds 30 $After = Test-AzDataProtectionBackupInstanceReadiness -ResourceGroupName $VaultRG -VaultName $TestBkpVault.Name -BackupInstance $instance[0].Property ($After -ne $null) | Should be $true diff --git a/src/DataProtection/DataProtection.Autorest/test/Start-AzDataProtectionBackupInstanceRestore.Tests.ps1 b/src/DataProtection/DataProtection.Autorest/test/Start-AzDataProtectionBackupInstanceRestore.Tests.ps1 index c8852ca9fda6..d195eb526510 100644 --- a/src/DataProtection/DataProtection.Autorest/test/Start-AzDataProtectionBackupInstanceRestore.Tests.ps1 +++ b/src/DataProtection/DataProtection.Autorest/test/Start-AzDataProtectionBackupInstanceRestore.Tests.ps1 @@ -12,21 +12,21 @@ while(-not $mockingPath) { . ($mockingPath | Select-Object -First 1).FullName Describe 'Start-AzDataProtectionBackupInstanceRestore' { - It 'CrossRegionRestoreAsDatabase' -skip { + It 'CrossRegionRestoreAsDatabase' -skip { $resourceGroupName = $env.TestCrossRegionRestoreScenario.ResourceGroupName $vaultName = $env.TestCrossRegionRestoreScenario.VaultName $subscriptionId = $env.TestCrossRegionRestoreScenario.SubscriptionId $targetResourceId = $env.TestCrossRegionRestoreScenario.TargetResourceId $secretURI = $env.TestCrossRegionRestoreScenario.SecretURI - + $vault = Search-AzDataProtectionBackupVaultInAzGraph -ResourceGroup $resourceGroupName -Subscription $subscriptionId -Vault $vaultName -UseSecondaryRegion $instance = Search-AzDataProtectionBackupInstanceInAzGraph -Subscription $subscriptionId -ResourceGroup $resourceGroupName -Vault $vaultName -DatasourceType AzureDatabaseForPostgreSQL - $recoveryPointsCrr = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $instance[0].Name -ResourceGroupName $resourceGroupName -VaultName $vaultName -SubscriptionId $subscriptionId -UseSecondaryRegion - + $recoveryPointsCrr = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $instance[0].Name -ResourceGroupName $resourceGroupName -VaultName $vaultName -SubscriptionId $subscriptionId -UseSecondaryRegion + $OssRestoreReq = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureDatabaseForPostgreSQL -SourceDataStore VaultStore -RestoreLocation $vault.ReplicatedRegion[0] -RestoreType AlternateLocation -RecoveryPoint $recoveryPointsCrr[0].Property.RecoveryPointId -TargetResourceId $targetResourceId -SecretStoreURI $secretURI -SecretStoreType AzureKeyVault - + # assumes permissions are preassigned $validateCRR = Test-AzDataProtectionBackupInstanceRestore -Name $instance[0].Name -ResourceGroupName $resourceGroupName -SubscriptionId $subscriptionId -VaultName $vaultName -RestoreRequest $OssRestoreReq -RestoreToSecondaryRegion @@ -40,12 +40,12 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $subscriptionId -ResourceGroupName $resourceGroupName -VaultName $vaultName -UseSecondaryRegion ($currentjob.OperationCategory -eq "CrossRegionRestore") | Should be $true - + $jobstatus = $currentjob.Status } } @@ -57,15 +57,15 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $subscriptionId = $env.TestCrossRegionRestoreScenario.SubscriptionId $targetContainerURI = $env.TestCrossRegionRestoreScenario.TargetContainerURI $fileNamePrefix = $env.TestCrossRegionRestoreScenario.FileNamePrefix + "-" + $recordDate - + $vault = Search-AzDataProtectionBackupVaultInAzGraph -ResourceGroup $resourceGroupName -Subscription $subscriptionId -Vault $vaultName -UseSecondaryRegion $instance = Search-AzDataProtectionBackupInstanceInAzGraph -Subscription $subscriptionId -ResourceGroup $resourceGroupName -Vault $vaultName -DatasourceType AzureDatabaseForPostgreSQL - $recoveryPointsCrr = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $instance[0].Name -ResourceGroupName $resourceGroupName -VaultName $vaultName -SubscriptionId $subscriptionId -UseSecondaryRegion - - $OssRestoreReq = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureDatabaseForPostgreSQL -SourceDataStore VaultStore -RestoreLocation $vault.ReplicatedRegion[0] -RestoreType RestoreAsFiles -RecoveryPoint $recoveryPointsCrr[0].Property.RecoveryPointId -TargetContainerURI $targetContainerURI -FileNamePrefix $fileNamePrefix - + $recoveryPointsCrr = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $instance[0].Name -ResourceGroupName $resourceGroupName -VaultName $vaultName -SubscriptionId $subscriptionId -UseSecondaryRegion + + $OssRestoreReq = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureDatabaseForPostgreSQL -SourceDataStore VaultStore -RestoreLocation $vault.ReplicatedRegion[0] -RestoreType RestoreAsFiles -RecoveryPoint $recoveryPointsCrr[0].Property.RecoveryPointId -TargetContainerURI $targetContainerURI -FileNamePrefix $fileNamePrefix + # assumes permissions are preassigned $validateCRR = Test-AzDataProtectionBackupInstanceRestore -Name $instance[0].Name -ResourceGroupName $resourceGroupName -SubscriptionId $subscriptionId -VaultName $vaultName -RestoreRequest $OssRestoreReq -RestoreToSecondaryRegion @@ -79,12 +79,12 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $subscriptionId -ResourceGroupName $resourceGroupName -VaultName $vaultName -UseSecondaryRegion ($currentjob.OperationCategory -eq "CrossRegionRestore") | Should be $true - + $jobstatus = $currentjob.Status } } @@ -97,7 +97,7 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $targetContainerArmId = $env.TestCrossSubscriptionRestoreScenario.TargetContainerArmId $targetContainerURI = $env.TestCrossSubscriptionRestoreScenario.TargetContainerURI $fileNamePrefix = $env.TestCrossSubscriptionRestoreScenario.FileNamePrefix + "-" + $recordDate - + $vault = Get-AzDataProtectionBackupVault -SubscriptionId $subscriptionId -ResourceGroupName $resourceGroupName -VaultName $vaultName $instance = Get-AzDataProtectionBackupInstance -SubscriptionId $subscriptionId -ResourceGroupName $resourceGroupName -VaultName $vaultName | Where { $_.Property.DataSourceInfo.ResourceType -match "Postgre" } @@ -117,7 +117,7 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $subscriptionId -ResourceGroupName $resourceGroupName -VaultName $vaultName $jobstatus = $currentjob.Status } @@ -129,7 +129,7 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $sub = $env.TestOssBackupScenario.SubscriptionId $rgName = $env.TestOssBackupScenario.ResourceGroupName $vaultName = $env.TestOssBackupScenario.VaultName - $policyName = $env.TestOssBackupScenario.PolicyName + $policyName = $env.TestOssBackupScenario.PolicyName $dataSourceId = $env.TestOssBackupScenario.OssDbId $serverName = $env.TestOssBackupScenario.OssServerName $keyVault = $env.TestOssBackupScenario.KeyVault @@ -137,14 +137,14 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $targetResourceId = $env.TestOssBackupScenario.TargetResourceId + "-" + $recordDate $targetContainerURI = $env.TestOssBackupScenario.TargetContainerURI $fileNamePrefix = $env.TestOssBackupScenario.FileNamePrefix + "-" + $recordDate - + $vault = Get-AzDataProtectionBackupVault -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName - + $instance = Get-AzDataProtectionBackupInstance -Subscription $sub -ResourceGroup $rgName -Vault $vaultName | Where-Object {($_.Property.DataSourceInfo.Type -eq "Microsoft.DBforPostgreSQL/servers/databases") -and ($_.Property.DataSourceInfo.ResourceId -match $serverName)} - + ($instance -ne $null) | Should be $true - # Trigger Backup + # Trigger Backup $policy = Get-AzDataProtectionBackupPolicy -SubscriptionId $sub -VaultName $vaultName -ResourceGroupName $rgName | where {$_.Name -eq $policyName} $backupJob = Backup-AzDataProtectionBackupInstanceAdhoc -BackupInstanceName $instance.Name -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName -BackupRuleOptionRuleName $policy.Property.PolicyRule[0].Name -TriggerOptionRetentionTagOverride $policy.Property.PolicyRule[0].Trigger.TaggingCriterion[0].TagInfoTagName @@ -153,39 +153,39 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } - Start-Sleep -Seconds 5 + Start-TestSleep -Seconds 5 - # Database restore + # Database restore $rps = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $instance.Name -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName $OssRestoreReq = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureDatabaseForPostgreSQL -SourceDataStore VaultStore -RestoreLocation $vault.Location -RestoreType AlternateLocation -RecoveryPoint $rps[0].Property.RecoveryPointId -TargetResourceId $targetResourceId -SecretStoreURI $secretURI -SecretStoreType AzureKeyVault $restoreJob = Start-AzDataProtectionBackupInstanceRestore -BackupInstanceName $instance.Name -ResourceGroupName $rgName -VaultName $vaultName -SubscriptionId $sub -Parameter $OssRestoreReq - Start-Sleep -Seconds 10 - + Start-TestSleep -Seconds 10 + $jobid = $restoreJob.JobId.Split("/")[-1] ($jobid -ne $null) | Should be $true $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } - Start-Sleep -Seconds 5 + Start-TestSleep -Seconds 5 # RestoreAsFiles $rps = Get-AzDataProtectionRecoveryPoint -BackupInstanceName $instance.Name -ResourceGroupName $rgName -SubscriptionId $sub -VaultName $vaultName - $OssRestoreReqFiles = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureDatabaseForPostgreSQL -SourceDataStore VaultStore -RestoreLocation $vault.Location -RestoreType RestoreAsFiles -RecoveryPoint $rps[0].Property.RecoveryPointId -TargetContainerURI $targetContainerURI -FileNamePrefix $fileNamePrefix + $OssRestoreReqFiles = Initialize-AzDataProtectionRestoreRequest -DatasourceType AzureDatabaseForPostgreSQL -SourceDataStore VaultStore -RestoreLocation $vault.Location -RestoreType RestoreAsFiles -RecoveryPoint $rps[0].Property.RecoveryPointId -TargetContainerURI $targetContainerURI -FileNamePrefix $fileNamePrefix $restoreFilesJob = Start-AzDataProtectionBackupInstanceRestore -BackupInstanceName $instance.Name -ResourceGroupName $rgName -VaultName $vaultName -SubscriptionId $sub -Parameter $OssRestoreReqFiles @@ -195,11 +195,11 @@ Describe 'Start-AzDataProtectionBackupInstanceRestore' { $jobstatus = "InProgress" while($jobstatus -ne "Completed") { - Start-Sleep -Seconds 10 + Start-TestSleep -Seconds 10 $currentjob = Get-AzDataProtectionJob -Id $jobid -SubscriptionId $sub -ResourceGroupName $rgName -VaultName $vaultName $jobstatus = $currentjob.Status } - } + } It 'TriggerExpanded' -skip { { throw [System.NotImplementedException] } | Should -Not -Throw diff --git a/src/EventHub/EventHub.Autorest/test/Approve-AzEventHubPrivateEndpointConnection.Tests.ps1 b/src/EventHub/EventHub.Autorest/test/Approve-AzEventHubPrivateEndpointConnection.Tests.ps1 index 30611fe2278c..19a10708e68a 100644 --- a/src/EventHub/EventHub.Autorest/test/Approve-AzEventHubPrivateEndpointConnection.Tests.ps1 +++ b/src/EventHub/EventHub.Autorest/test/Approve-AzEventHubPrivateEndpointConnection.Tests.ps1 @@ -16,7 +16,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Approve-AzEventHubPrivateEndp Describe 'Approve-AzEventHubPrivateEndpointConnection' { $privateEndpoint = Get-AzEventHubPrivateEndpointConnection -ResourceGroupName $env.resourceGroup -NamespaceName $env.namespace - + It 'SetExpanded' { $privateEndpoint[0].ConnectionState | Should -Be "Pending" $privateEndpoint[0].Description | Should -Be "Hello" @@ -27,9 +27,7 @@ Describe 'Approve-AzEventHubPrivateEndpointConnection' { while($firstPrivateEndpoint.ProvisioningState -ne "Succeeded"){ $firstPrivateEndpoint = Get-AzEventHubPrivateEndpointConnection -Name $privateEndpoint[0].Name -ResourceGroupName $env.resourceGroup -NamespaceName $env.namespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } } @@ -42,9 +40,7 @@ Describe 'Approve-AzEventHubPrivateEndpointConnection' { while($secondPrivateEndpoint.ProvisioningState -ne "Succeeded"){ $secondPrivateEndpoint = Get-AzEventHubPrivateEndpointConnection -Name $privateEndpoint[1].Name -ResourceGroupName $env.resourceGroup -NamespaceName $env.namespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } } } diff --git a/src/EventHub/EventHub.Autorest/test/New-AzEventHubGeoDRConfiguration.Tests.ps1 b/src/EventHub/EventHub.Autorest/test/New-AzEventHubGeoDRConfiguration.Tests.ps1 index 49d0d94f00de..9501c7490754 100644 --- a/src/EventHub/EventHub.Autorest/test/New-AzEventHubGeoDRConfiguration.Tests.ps1 +++ b/src/EventHub/EventHub.Autorest/test/New-AzEventHubGeoDRConfiguration.Tests.ps1 @@ -24,9 +24,7 @@ Describe 'New-AzEventHubGeoDRConfiguration' { while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace diff --git a/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationBreakPair.Tests.ps1 b/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationBreakPair.Tests.ps1 index 7d323bd3512e..c39406dbe213 100644 --- a/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationBreakPair.Tests.ps1 +++ b/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationBreakPair.Tests.ps1 @@ -17,12 +17,10 @@ if(($null -eq $TestName) -or ($TestName -contains 'Set-AzEventHubGeoDRConfigurat Describe 'Set-AzEventHubGeoDRConfigurationBreakPair' { It 'Break' { Set-AzEventHubGeoDRConfigurationBreakPair -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -Name $env.alias - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } $drConfig.Name | Should -Be $env.alias @@ -31,12 +29,10 @@ Describe 'Set-AzEventHubGeoDRConfigurationBreakPair' { $drConfig.Role | Should -Be "PrimaryNotReplicating" $drConfig = New-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -PartnerNamespace $env.secondaryNamespaceResourceId - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } } @@ -44,12 +40,10 @@ Describe 'Set-AzEventHubGeoDRConfigurationBreakPair' { $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace Set-AzEventHubGeoDRConfigurationBreakPair -InputObject $drConfig - + do{ $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } while($drConfig.ProvisioningState -ne "Succeeded") $drConfig.Name | Should -Be $env.alias @@ -58,12 +52,10 @@ Describe 'Set-AzEventHubGeoDRConfigurationBreakPair' { $drConfig.Role | Should -Be "PrimaryNotReplicating" $drConfig = New-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -PartnerNamespace $env.secondaryNamespaceResourceId - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } } } diff --git a/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationFailOver.Tests.ps1 b/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationFailOver.Tests.ps1 index fc248ddd289b..74d7a841eae5 100644 --- a/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationFailOver.Tests.ps1 +++ b/src/EventHub/EventHub.Autorest/test/Set-AzEventHubGeoDRConfigurationFailOver.Tests.ps1 @@ -17,12 +17,10 @@ if(($null -eq $TestName) -or ($TestName -contains 'Set-AzEventHubGeoDRConfigurat Describe 'Set-AzEventHubGeoDRConfigurationFailOver' { It 'Fail' { Set-AzEventHubGeoDRConfigurationFailOver -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace -Name $env.alias - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } $drConfig.Name | Should -Be $env.alias @@ -31,28 +29,22 @@ Describe 'Set-AzEventHubGeoDRConfigurationFailOver' { $drConfig.Role | Should -Be "PrimaryNotReplicating" $drConfig = Remove-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 180 - } + Start-TestSleep 180 $drConfig = New-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -PartnerNamespace $env.secondaryNamespaceResourceId - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } } It 'FailViaIdentity' { $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace - + Set-AzEventHubGeoDRConfigurationFailOver -InputObject $drConfig - + do { $drConfig = Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace - if ($TestMode -ne 'playback') { - Start-Sleep 10 - } + Start-TestSleep 10 } while($drConfig.ProvisioningState -ne "Succeeded") $drConfig.Name | Should -Be $env.alias @@ -61,10 +53,7 @@ Describe 'Set-AzEventHubGeoDRConfigurationFailOver' { $drConfig.Role | Should -Be "PrimaryNotReplicating" $drConfig = Remove-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace - - if ($TestMode -ne 'playback') { - Start-Sleep 180 - } + Start-TestSleep 180 { Get-AzEventHubGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace } | Should -Throw } diff --git a/src/Functions/Functions.Autorest/test/helper.ps1 b/src/Functions/Functions.Autorest/test/helper.ps1 index d29116faa139..75c166a3f076 100644 --- a/src/Functions/Functions.Autorest/test/helper.ps1 +++ b/src/Functions/Functions.Autorest/test/helper.ps1 @@ -21,7 +21,7 @@ function WaitForJobToComplete while ($true) { Write-Verbose "Wait time in seconds: $($tries*$WaitTimeInSeconds)" -Verbose - Start-Sleep -Seconds $WaitTimeInSeconds + Start-TestSleep -Seconds $WaitTimeInSeconds $result = Get-Job -Id $JobId Write-Verbose "JobState: $($result.State)" -Verbose @@ -93,4 +93,4 @@ function GetStorageAccountEndpointSuffix "AzureCloud" { ';EndpointSuffix=core.windows.net' } default { '' } } -} \ No newline at end of file +} diff --git a/src/LabServices/LabServices.Autorest/test/WebRequestHandler.psm1 b/src/LabServices/LabServices.Autorest/test/WebRequestHandler.psm1 index 1b7203dd7af2..a03ed44ecb1b 100644 --- a/src/LabServices/LabServices.Autorest/test/WebRequestHandler.psm1 +++ b/src/LabServices/LabServices.Autorest/test/WebRequestHandler.psm1 @@ -146,11 +146,11 @@ function InvokeRest($Uri, $Method, $Body, $params) { if ($params) { $fullUri += '&' + $params } - if ($body) { Write-Verbose $body } + if ($body) { Write-Verbose $body } $result = Invoke-WebRequest -Uri $FullUri -Method $Method -Headers $authHeaders -Body $Body -UseBasicParsing #Write-Host $result $resObj = $result.Content | ConvertFrom-Json - + # Happens with Post commands ... if (-not $resObj) { return $resObj } @@ -178,7 +178,7 @@ function WaitProvisioning($uri, $delaySec, $retryCount, $params) { if (-not ($tries -lt $retryCount)) { throw ("$retryCount retries of retrieving $uri with ProvisioningState = Succeeded failed") } - Start-Sleep -Seconds $delaySec + Start-TestSleep -Seconds $delaySec $res = InvokeRest -Uri $uri -Method 'Get' -params $params $tries += 1 } @@ -186,7 +186,7 @@ function WaitProvisioning($uri, $delaySec, $retryCount, $params) { } function CheckExists($uri){ - try { + try { $authHeaders = GetHeaderWithAuthToken if ($Uri.Contains("?api-version")) { @@ -194,7 +194,7 @@ function CheckExists($uri){ } else { $fullUri = $uri + '?' + $ApiVersion } - + $result = Invoke-WebRequest -Uri $fullUri -Method 'Get' -Headers $authHeaders -UseBasicParsing | Select-Object -Expand StatusCode if ($result -eq 200){ @@ -210,4 +210,4 @@ function CheckExists($uri){ Export-ModuleMember -Function InvokeRest, WaitProvisioning, - CheckExists \ No newline at end of file + CheckExists diff --git a/src/MySql/MySql.Autorest/test/AzMySqlFlexibleServerCreateWithVnet.Tests.ps1 b/src/MySql/MySql.Autorest/test/AzMySqlFlexibleServerCreateWithVnet.Tests.ps1 index e26726a83e3f..dbe58d291a83 100644 --- a/src/MySql/MySql.Autorest/test/AzMySqlFlexibleServerCreateWithVnet.Tests.ps1 +++ b/src/MySql/MySql.Autorest/test/AzMySqlFlexibleServerCreateWithVnet.Tests.ps1 @@ -17,19 +17,17 @@ $DEFAULT_SUBNET_PREFIX = '10.0.0.0/24' Describe 'AzMySqlFlexibleServerCreateWithVnet' { function WaitServerDelete(){ - if ($TestMode -eq 'live') { - Start-Sleep -Seconds 450 - } + Start-TestSleep -Seconds 450 } function ValidateSubnetVnet($Server, $VnetName, $SubnetName){ $Vnet = Get-AzVirtualNetwork -Name $VNetName -ResourceGroupName $env.resourceGroup $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $SubnetName -VirtualNetwork $Vnet - + $Server.DelegatedSubnetArgumentSubnetArmResourceId | Should -Be $Subnet.Id $Delegation = Get-AzDelegation -Name Microsoft.DBforMySQL/flexibleServers -Subnet $Subnet $Delegation.ServiceName | Should -Be $DELEGATION_SERVICE_NAME } - + function RemoveServerVnet($ServerName, $VnetName, $SubnetName){ $Vnet = Get-AzVirtualNetwork -Name $VNetName -ResourceGroupName $env.resourceGroup $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $SubnetName -VirtualNetwork $Vnet @@ -40,13 +38,13 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { Set-AzVirtualNetwork -VirtualNetwork $Vnet Remove-AzVirtualNetwork -Name $Vnet.Name -ResourceGroupName $env.resourceGroup -Force } - + It 'NoArgumentsScenario' { { if ($TestMode -eq 'live') { $Server = New-AzMySqlFlexibleServer -Location $env.location $Server | Get-Member - $Splits = $Server.Id -Split "/" + $Splits = $Server.Id -Split "/" $ResourceGroupName = $Splits[4] $SubnetName = 'Subnet' + $Server.Name $VnetName = 'VNET' + $Server.Name @@ -60,7 +58,7 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { $Vnet = Get-AzVirtualNetwork -Name $VNetName -ResourceGroupName $ResourceGroupName $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $SubnetName -VirtualNetwork $Vnet - + $Server.DelegatedSubnetArgumentSubnetArmResourceId | Should -Be $Subnet.Id $Delegation = Get-AzDelegation -Name Microsoft.DBforMySQL/flexibleServers -Subnet $Subnet $Delegation.ServiceName | Should -Be $DELEGATION_SERVICE_NAME @@ -81,7 +79,7 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { # valid vnet name and the vnet exists $Vnet = New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName $env.resourceGroup -Location $env.location -AddressPrefix $DEFAULT_VNET_PREFIX -Force $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Vnet $Vnet.Name - + $SubnetName = 'Subnet' + $Server.Name ValidateSubnetVnet $Server $env.VNetName $SubnetName RemoveServerVnet $env.flexibleServerName3 $env.VNetName $SubnetName @@ -94,7 +92,7 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { if ($TestMode -eq 'live') { # valid vnet name but the vnet doesn't exist $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Vnet nonexistingvnetforpowershelltest - + $SubnetName = 'Subnet' + $Server.Name ValidateSubnetVnet $Server nonexistingvnetforpowershelltest $SubnetName RemoveServerVnet $env.flexibleServerName2 nonexistingvnetforpowershelltest $SubnetName @@ -108,14 +106,14 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { # # invalid vnet name # $InvalidName = "hi/df!@$@#$@" # New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Vnet $InvalidName - + # } | Should -Throw # } # } # It 'VnetIdScenario-ValidVnet' { # { - # if ($TestMode -eq 'live') { + # if ($TestMode -eq 'live') { # # valid vnet Id but the vnet doesn't exist # $VnetId = "/subscriptions/$($env.SubscriptionId)/resourceGroups/$($env.resourceGroup)/providers/Microsoft.Network/virtualNetworks/nonexistingvnetforpowershelltest" # $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Vnet $VnetId @@ -130,10 +128,10 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { # It 'VnetIdScenario-ValidVnetNotExist' { # { # if ($TestMode -eq 'live') { - # # valid vnet Id and the vnet exists (subnet does not exist) + # # valid vnet Id and the vnet exists (subnet does not exist) # $Vnet = New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName $env.resourceGroup -Location $env.Location -AddressPrefix $DEFAULT_VNET_PREFIX -Force # $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Vnet $Vnet.Id - + # $SubnetName = 'Subnet' + $Server.Name # ValidateSubnetVnet $Server $env.VNetName $SubnetName # RemoveServerVnet $env.flexibleServerName2 $env.VNetName $SubnetName @@ -159,7 +157,7 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName $env.resourceGroup -Location $env.location -AddressPrefix $DEFAULT_VNET_PREFIX -Subnet $Subnet -Force $SubnetId = "/subscriptions/$($env.SubscriptionId)/resourceGroups/$($env.resourceGroup)/providers/Microsoft.Network/virtualNetworks/$($env.VNetName)" + "/subnets/$($env.SubnetName)" $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Subnet $SubnetId - + ValidateSubnetVnet $Server $env.VNetName $env.SubnetName RemoveServerVnet $env.flexibleServerName3 $env.VNetName $env.SubnetName } @@ -175,14 +173,14 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { $Vnet = New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName MySqlTest2 -Location $env.location -AddressPrefix $DEFAULT_VNET_PREFIX -Subnet $Subnet -Force $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $env.SubnetName -VirtualNetwork $Vnet $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Subnet $Subnet.Id - + $Vnet = Get-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName MySqlTest2 $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $env.SubnetName -VirtualNetwork $Vnet - + $Server.DelegatedSubnetArgumentSubnetArmResourceId | Should -Be $Subnet.Id $Delegation = Get-AzDelegation -Name Microsoft.DBforMySQL/flexibleServers -Subnet $Subnet - $Delegation.ServiceName | Should -Be $DELEGATION_SERVICE_NAME - + $Delegation.ServiceName | Should -Be $DELEGATION_SERVICE_NAME + Remove-AzMySqlFlexibleServer -ResourceGroupName $env.resourceGroup -Name $env.flexibleServerName3 WaitServerDelete $Subnet = Remove-AzDelegation -Name $DELEGATION_SERVICE_NAME -Subnet $Subnet @@ -202,7 +200,7 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { # $Vnet | Set-AzVirtualNetwork # $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $env.SubnetName -VirtualNetwork $Vnet # $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Subnet $Subnet.Id - + # ValidateSubnetVnet $Server $env.VNetName $env.SubnetName # RemoveServerVnet $env.flexibleServerName2 $env.VNetName $env.SubnetName # } @@ -215,7 +213,7 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { # # valid subnet Id but the subnet doesn't exist # $SubnetId = "/subscriptions/$($env.SubscriptionId)/resourceGroups/$($env.resourceGroup)/providers/Microsoft.Network/virtualNetworks/nonexistingvnetforpowershelltest/subnets/nonexistingsubnetforpowershelltest" # $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Subnet $SubnetId - + # ValidateSubnetVnet $Server nonexistingvnetforpowershelltest nonexistingsubnetforpowershelltest # RemoveServerVnet $env.flexibleServerName3 nonexistingvnetforpowershelltest nonexistingsubnetforpowershelltest # } @@ -249,7 +247,7 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { if ($TestMode -eq 'live') { # vnet name and subnet name resource do not exist $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Vnet $env.VNetName -Subnet $env.SubnetName -VnetPrefix $DEFAULT_VNET_PREFIX -SubnetPrefix $DEFAULT_SUBNET_PREFIX - + ValidateSubnetVnet $Server $env.VNetName $env.SubnetName Remove-AzMySqlFlexibleServer -ResourceGroupName $env.resourceGroup -Name $env.flexibleServerName3 } @@ -261,10 +259,10 @@ Describe 'AzMySqlFlexibleServerCreateWithVnet' { if ($TestMode -eq 'live') { # vnet name and subnet name, resource exist $Server = New-AzMySqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Vnet $env.VNetName -Subnet $env.SubnetName - + ValidateSubnetVnet $Server $env.VNetName $env.SubnetName RemoveServerVnet $env.flexibleServerName2 $env.VNetName $env.SubnetName } } | Should -Not -Throw } -} \ No newline at end of file +} diff --git a/src/NetworkAnalytics/NetworkAnalytics.Autorest/test/AzNetworkAnalyticsDataProduct.Tests.ps1 b/src/NetworkAnalytics/NetworkAnalytics.Autorest/test/AzNetworkAnalyticsDataProduct.Tests.ps1 index fceb70d9cb08..8ea4c65f3b61 100644 --- a/src/NetworkAnalytics/NetworkAnalytics.Autorest/test/AzNetworkAnalyticsDataProduct.Tests.ps1 +++ b/src/NetworkAnalytics/NetworkAnalytics.Autorest/test/AzNetworkAnalyticsDataProduct.Tests.ps1 @@ -21,7 +21,7 @@ Describe 'New-AzNetworkAnalyticsDataProduct' { $CreateDataProductJob = New-AzNetworkAnalyticsDataProduct -Name $env.DataProductNameForMaxSet -Product $env.Product -MajorVersion $env.MajorVersion -Publisher $env.Publisher -Location $env.Location -ResourceGroupName $env.ResourceGroupName -PurviewAccount $env.PurviewAccount -CurrentMinorVersion $env.CurrentMinorVersion -NetworkaclAllowedQueryIPRangeList $env.NetworkaclAllowedQueryIPRangeList -PurviewCollection $env.PurviewCollection -CustomerEncryptionKeyName $env.CustomerEncryptionKeyName -NetworkaclDefaultAction $env.NetworkaclDefaultAction -Redundancy $env.Redundancy -CustomerEncryptionKeyVaultUri $env.CustomerEncryptionKeyVaultUri -NetworkaclIPRule @(@{ value = "1.1.1.1"; action = "Allow"}) -Tag @{ envType = "prod"; region = "us"} -CustomerEncryptionKeyVersion $env.CustomerEncryptionKeyVersion -NetworkaclVirtualNetworkRule @(@{ id = "/subscriptions/susbcription/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/checkVnet/subnets/default"; state = "Provisioning"; action = "Allow"}) -CustomerManagedKeyEncryptionEnabled $env.CustomerManagedKeyEncryptionEnabled -Owner $env.Owner -IdentityType $env.IdentityType -PrivateLinksEnabled $env.PrivateLinksEnabled -PublicNetworkAccess $env.PublicNetworkAccess -IdentityUserAssignedIdentity @{"/subscriptions/susbcriptionId/resourcegroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/aa1221aa1-id"=@{}} -AsJob Wait-Job $CreateDataProductJob $JobResult = Receive-Job $CreateDataProductJob - $JobResult.Name | Should -be $env.DataProductNameForMaxSet + $JobResult.Name | Should -be $env.DataProductNameForMaxSet $JobResult.Product | should -be $env.Product } | Should -Not -Throw } @@ -31,7 +31,7 @@ Describe 'New-AzNetworkAnalyticsDataProduct' { $CreateDataProductJob = New-AzNetworkAnalyticsDataProduct -Name $env.DataProductName -Product $env.Product -MajorVersion $env.MajorVersion -Publisher $env.Publisher -Location $env.Location -ResourceGroupName $env.ResourceGroupName -AsJob Wait-Job $CreateDataProductJob $JobResult = Receive-Job $CreateDataProductJob - $JobResult.Name | Should -be $env.DataProductName + $JobResult.Name | Should -be $env.DataProductName $JobResult.Product | should -be $env.Product } | Should -Not -Throw } @@ -55,7 +55,7 @@ Describe 'New-AzNetworkAnalyticsDataProduct' { $GetDataProductsPerRG.Count | Should -BeGreaterOrEqual 1 $GetDataProductsPerRG.Name.Contains($env.DataProductName)| Should -Be $true $GetDataProductsPerRG.Name.Contains($env.DataProductNameForMaxSet)| Should -Be $true - $GetDataProductsPerRG.Location.Contains($env.Location)| Should -Be $true + $GetDataProductsPerRG.Location.Contains($env.Location)| Should -Be $true } It 'Add Data Product User Role' { @@ -74,9 +74,9 @@ Describe 'New-AzNetworkAnalyticsDataProduct' { It 'Remove Data Product User Role' { { - Remove-AzNetworkAnalyticsDataProductUserRole -ResourceGroupName $env.ResourceGroupName -DataProductName $env.DataProductName -Role $env.Role -PrincipalType $env.PrincipalType -RoleId $env.RoleId -PrincipalId $env.UserOnePrincipalId -DataTypeScope $env.DataTypeScope -RoleAssignmentId $env.RoleAssignmentId -UserName $env.UserOneName + Remove-AzNetworkAnalyticsDataProductUserRole -ResourceGroupName $env.ResourceGroupName -DataProductName $env.DataProductName -Role $env.Role -PrincipalType $env.PrincipalType -RoleId $env.RoleId -PrincipalId $env.UserOnePrincipalId -DataTypeScope $env.DataTypeScope -RoleAssignmentId $env.RoleAssignmentId -UserName $env.UserOneName #Write-Host "Sleeping for 1 minutes" - #Start-Sleep -Seconds 60 + #Start-TestSleep -Seconds 60 $GetDataProductUserRole = Get-AzNetworkAnalyticsDataProductRoleAssignment -ResourceGroupName $env.ResourceGroupName -DataProductName $env.DataProductName $GetDataProductUserRole.RoleAssignmentResponse.PrincipalId.Contains($env.UserOnePrincipalId)| Should -Be $false } | Should -Not -Throw diff --git a/src/PostgreSql/PostgreSql.Autorest/test/AzPostgreSqlFlexibleServerCreateWithVnet.Tests.ps1 b/src/PostgreSql/PostgreSql.Autorest/test/AzPostgreSqlFlexibleServerCreateWithVnet.Tests.ps1 index d9299879469b..b718c2791b46 100644 --- a/src/PostgreSql/PostgreSql.Autorest/test/AzPostgreSqlFlexibleServerCreateWithVnet.Tests.ps1 +++ b/src/PostgreSql/PostgreSql.Autorest/test/AzPostgreSqlFlexibleServerCreateWithVnet.Tests.ps1 @@ -19,9 +19,7 @@ $DEFAULT_SUBNET_PREFIX = '10.0.0.0/24' Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { function WaitServerDelete(){ - if ($TestMode -eq 'live') { - Start-Sleep -Seconds 500 - } + Start-TestSleep -Seconds 500 } function ValidateSubnetVnet($Server, $VnetName, $SubnetName, $SubnetPrefix){ $Vnet = Get-AzVirtualNetwork -Name $VNetName -ResourceGroupName $env.resourceGroup @@ -32,7 +30,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { $Delegation.ServiceName | Should -Be $DELEGATION_SERVICE_NAME $Subnet.AddressPrefix | Should -Be $SubnetPrefix } - + function RemoveServerVnet($ServerName, $VnetName, $SubnetName){ $Vnet = Get-AzVirtualNetwork -Name $VNetName -ResourceGroupName $env.resourceGroup $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $SubnetName -VirtualNetwork $Vnet @@ -51,7 +49,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { # valid vnet name and the vnet exists $Vnet = New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName $env.resourceGroup -Location $env.location -AddressPrefix $DEFAULT_VNET_PREFIX -Force $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Vnet $Vnet.Name - + $SubnetName = 'Subnet' + $Server.Name ValidateSubnetVnet $Server $env.VNetName $SubnetName $DEFAULT_SUBNET_PREFIX RemoveServerVnet $env.flexibleServerName2 $env.VNetName $SubnetName @@ -64,7 +62,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { { # valid vnet name but the vnet doesn't exist $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Vnet nonexistingvnetforpowershelltest - + $SubnetName = 'Subnet' + $Server.Name ValidateSubnetVnet $Server nonexistingvnetforpowershelltest $SubnetName $DEFAULT_SUBNET_PREFIX RemoveServerVnet $env.flexibleServerName3 nonexistingvnetforpowershelltest $SubnetName @@ -84,7 +82,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { It 'VnetIdScenario-ValidVnetNotExist' { If ($TestMode -eq 'live' -or $TestMode -eq 'record') { - { + { # valid vnet Id but the vnet doesn't exist $VnetId = "/subscriptions/$($env.SubscriptionId)/resourceGroups/$($env.resourceGroup)/providers/Microsoft.Network/virtualNetworks/nonexistingvnetforpowershelltest" $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Vnet $VnetId @@ -99,10 +97,10 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { It 'VnetIdScenario-ValidVnet' { If ($TestMode -eq 'live' -or $TestMode -eq 'record') { { - # valid vnet Id and the vnet exists (subnet does not exist) + # valid vnet Id and the vnet exists (subnet does not exist) $Vnet = New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName $env.resourceGroup -Location $env.Location -AddressPrefix $DEFAULT_VNET_PREFIX -Force $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Vnet $Vnet.Id - + $SubnetName = 'Subnet' + $Server.Name ValidateSubnetVnet $Server $env.VNetName $SubnetName $DEFAULT_SUBNET_PREFIX RemoveServerVnet $env.flexibleServerName3 $env.VNetName $SubnetName @@ -119,7 +117,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { } | Should -Throw } } - + It 'SubnetIdScenario-ValidSubnet' { If ($TestMode -eq 'live' -or $TestMode -eq 'record') { { @@ -130,7 +128,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName $env.resourceGroup -Location $env.location -AddressPrefix $SubnetPrefix -Subnet $Subnet -Force $SubnetId = "/subscriptions/$($env.SubscriptionId)/resourceGroups/$($env.resourceGroup)/providers/Microsoft.Network/virtualNetworks/$($env.VNetName)" + "/subnets/$($env.SubnetName)" $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Subnet $SubnetId - + ValidateSubnetVnet $Server $env.VNetName $env.SubnetName $SubnetPrefix RemoveServerVnet $env.flexibleServerName2 $env.VNetName $env.SubnetName } | Should -Not -Throw @@ -146,14 +144,14 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { $Vnet = New-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName PostgreSqlTest2 -Location $env.location -AddressPrefix $DEFAULT_VNET_PREFIX -Subnet $Subnet -Force $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $env.SubnetName -VirtualNetwork $Vnet $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Subnet $Subnet.Id - + $Vnet = Get-AzVirtualNetwork -Name $env.VNetName -ResourceGroupName PostgreSqlTest2 $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $env.SubnetName -VirtualNetwork $Vnet - + $Server.DelegatedSubnetArgumentSubnetArmResourceId | Should -Be $Subnet.Id $Delegation = Get-AzDelegation -Name Microsoft.DBforPostgreSql/flexibleServers -Subnet $Subnet - $Delegation.ServiceName | Should -Be $DELEGATION_SERVICE_NAME - + $Delegation.ServiceName | Should -Be $DELEGATION_SERVICE_NAME + Remove-AzPostgreSqlFlexibleServer -ResourceGroupName $env.resourceGroup -Name $env.flexibleServerName3 WaitServerDelete Remove-AzVirtualNetwork -Name $Vnet.Name -ResourceGroupName PostgreSqlTest2 -Force @@ -171,7 +169,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { $Vnet | Set-AzVirtualNetwork $Subnet = Get-AzVirtualNetworkSubnetConfig -Name $env.SubnetName -VirtualNetwork $Vnet $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Subnet $Subnet.Id - + ValidateSubnetVnet $Server $env.VNetName $env.SubnetName RemoveServerVnet $env.flexibleServerName2 $env.VNetName $env.SubnetName } | Should -Not -Throw @@ -184,7 +182,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { # valid subnet Id but the subnet doesn't exist $SubnetId = "/subscriptions/$($env.SubscriptionId)/resourceGroups/$($env.resourceGroup)/providers/Microsoft.Network/virtualNetworks/nonexistingvnetforpowershelltest/subnets/nonexistingsubnetforpowershelltest" $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Subnet $SubnetId - + ValidateSubnetVnet $Server nonexistingvnetforpowershelltest nonexistingsubnetforpowershelltest RemoveServerVnet $env.flexibleServerName3 nonexistingvnetforpowershelltest nonexistingsubnetforpowershelltest } | Should -Not -Throw @@ -210,7 +208,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { Set-AzVirtualNetwork $Vnet Remove-AzVirtualNetwork -Name $Vnet.Name -ResourceGroupName $env.resourceGroup } | Should -Throw - } + } } It 'VnetSubnetScenario-ValidVnetSubnetNotExist' { @@ -218,7 +216,7 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { { # vnet name and subnet name resource do not exist $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName2 -ResourceGroupName $env.resourceGroup -Vnet $env.VNetName -Subnet $env.SubnetName -VnetPrefix $DEFAULT_VNET_PREFIX -SubnetPrefix $DEFAULT_SUBNET_PREFIX - + ValidateSubnetVnet $Server $env.VNetName $env.SubnetName Remove-AzPostgreSqlFlexibleServer -ResourceGroupName $env.resourceGroup -Name $env.flexibleServerName2 } | Should -Not -Throw @@ -230,10 +228,10 @@ Describe 'AzPostgreSqlFlexibleServerCreateWithVnet' { { # vnet name and subnet name, resource exist $Server = New-AzPostgreSqlFlexibleServer -Location $env.location -Name $env.flexibleServerName3 -ResourceGroupName $env.resourceGroup -Vnet $env.VNetName -Subnet $env.SubnetName - + ValidateSubnetVnet $Server $env.VNetName $env.SubnetName RemoveServerVnet $env.flexibleServerName3 $env.VNetName $env.SubnetName } | Should -Not -Throw } } -} \ No newline at end of file +} diff --git a/src/ServiceBus/ServiceBus.Autorest/test/Approve-AzServiceBusPrivateEndpointConnection.Tests.ps1 b/src/ServiceBus/ServiceBus.Autorest/test/Approve-AzServiceBusPrivateEndpointConnection.Tests.ps1 index ff31cb0622bb..b1af627566da 100644 --- a/src/ServiceBus/ServiceBus.Autorest/test/Approve-AzServiceBusPrivateEndpointConnection.Tests.ps1 +++ b/src/ServiceBus/ServiceBus.Autorest/test/Approve-AzServiceBusPrivateEndpointConnection.Tests.ps1 @@ -16,7 +16,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Approve-AzServiceBusPrivateEn Describe 'Approve-AzServiceBusPrivateEndpointConnection' { $privateEndpoint = Get-AzServiceBusPrivateEndpointConnection -ResourceGroupName $env.resourceGroup -NamespaceName $env.namespace - + It 'SetExpanded' { $privateEndpoint[0].ConnectionState | Should -Be "Pending" $privateEndpoint[0].Description | Should -Be "Hello" @@ -27,7 +27,7 @@ Describe 'Approve-AzServiceBusPrivateEndpointConnection' { while($firstPrivateEndpoint.ProvisioningState -ne "Succeeded"){ $firstPrivateEndpoint = Get-AzServiceBusPrivateEndpointConnection -Name $privateEndpoint[0].Name -ResourceGroupName $env.resourceGroup -NamespaceName $env.namespace - Start-Sleep 10 + Start-TestSleep 10 } } @@ -40,7 +40,7 @@ Describe 'Approve-AzServiceBusPrivateEndpointConnection' { while($secondPrivateEndpoint.ProvisioningState -ne "Succeeded"){ $secondPrivateEndpoint = Get-AzServiceBusPrivateEndpointConnection -Name $privateEndpoint[1].Name -ResourceGroupName $env.resourceGroup -NamespaceName $env.namespace - Start-Sleep 10 + Start-TestSleep 10 } } } diff --git a/src/ServiceBus/ServiceBus.Autorest/test/New-AzServiceBusGeoDRConfiguration.Tests.ps1 b/src/ServiceBus/ServiceBus.Autorest/test/New-AzServiceBusGeoDRConfiguration.Tests.ps1 index b146478a225d..89d7e6c041bd 100644 --- a/src/ServiceBus/ServiceBus.Autorest/test/New-AzServiceBusGeoDRConfiguration.Tests.ps1 +++ b/src/ServiceBus/ServiceBus.Autorest/test/New-AzServiceBusGeoDRConfiguration.Tests.ps1 @@ -24,7 +24,7 @@ Describe 'New-AzServiceBusGeoDRConfiguration' { while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace - Start-Sleep 10 + Start-TestSleep 10 } $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace diff --git a/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationBreakPair.Tests.ps1 b/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationBreakPair.Tests.ps1 index 65df4ee091db..d6bb55b3f2c8 100644 --- a/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationBreakPair.Tests.ps1 +++ b/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationBreakPair.Tests.ps1 @@ -17,11 +17,11 @@ if(($null -eq $TestName) -or ($TestName -contains 'Set-AzServiceBusGeoDRConfigur Describe 'Set-AzServiceBusGeoDRConfigurationBreakPair' { It 'Break' { Set-AzServiceBusGeoDRConfigurationBreakPair -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -Name $env.alias - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 10 + Start-TestSleep 10 } } @@ -31,11 +31,11 @@ Describe 'Set-AzServiceBusGeoDRConfigurationBreakPair' { $drConfig.Role | Should -Be "PrimaryNotReplicating" $drConfig = New-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -PartnerNamespace $env.secondaryNamespaceResourceId - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 10 + Start-TestSleep 10 } } } @@ -44,11 +44,11 @@ Describe 'Set-AzServiceBusGeoDRConfigurationBreakPair' { $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace Set-AzServiceBusGeoDRConfigurationBreakPair -InputObject $drConfig - + do{ $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 10 + Start-TestSleep 10 } } while($drConfig.ProvisioningState -ne "Succeeded") @@ -58,11 +58,11 @@ Describe 'Set-AzServiceBusGeoDRConfigurationBreakPair' { $drConfig.Role | Should -Be "PrimaryNotReplicating" $drConfig = New-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -PartnerNamespace $env.secondaryNamespaceResourceId - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 10 + Start-TestSleep 10 } } } diff --git a/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationFailOver.Tests.ps1 b/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationFailOver.Tests.ps1 index 9dac4c2743e3..b659270bc2e2 100644 --- a/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationFailOver.Tests.ps1 +++ b/src/ServiceBus/ServiceBus.Autorest/test/Set-AzServiceBusGeoDRConfigurationFailOver.Tests.ps1 @@ -17,11 +17,11 @@ if(($null -eq $TestName) -or ($TestName -contains 'Set-AzServiceBusGeoDRConfigur Describe 'Set-AzServiceBusGeoDRConfigurationFailOver' { It 'Fail' { Set-AzServiceBusGeoDRConfigurationFailOver -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace -Name $env.alias - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 10 + Start-TestSleep 10 } } @@ -32,26 +32,26 @@ Describe 'Set-AzServiceBusGeoDRConfigurationFailOver' { $drConfig = Remove-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 180 + Start-TestSleep 180 } $drConfig = New-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace -PartnerNamespace $env.secondaryNamespaceResourceId - + while($drConfig.ProvisioningState -ne "Succeeded"){ $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 10 + Start-TestSleep 10 } } } It 'FailViaIdentity' { $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace - + Set-AzServiceBusGeoDRConfigurationFailOver -InputObject $drConfig - + do { $drConfig = Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace if ($TestMode -ne 'playback') { - Start-Sleep 10 + Start-TestSleep 10 } } while($drConfig.ProvisioningState -ne "Succeeded") @@ -61,9 +61,9 @@ Describe 'Set-AzServiceBusGeoDRConfigurationFailOver' { $drConfig.Role | Should -Be "PrimaryNotReplicating" $drConfig = Remove-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.secondaryNamespace - + if ($TestMode -ne 'playback') { - Start-Sleep 180 + Start-TestSleep 180 } { Get-AzServiceBusGeoDRConfiguration -Name $env.alias -ResourceGroupName $env.resourceGroup -NamespaceName $env.primaryNamespace } | Should -Throw diff --git a/src/ServiceBus/ServiceBus.Autorest/test/Start-AzServiceBusMigration.Tests.ps1 b/src/ServiceBus/ServiceBus.Autorest/test/Start-AzServiceBusMigration.Tests.ps1 index 20170080f95c..16531fff62b0 100644 --- a/src/ServiceBus/ServiceBus.Autorest/test/Start-AzServiceBusMigration.Tests.ps1 +++ b/src/ServiceBus/ServiceBus.Autorest/test/Start-AzServiceBusMigration.Tests.ps1 @@ -23,20 +23,20 @@ Describe 'Start-AzServiceBusMigration' { do { $migrationConfig = Get-AzServiceBusMigration -ResourceGroupName $env.resourceGroup -NamespaceName $env.migrationPrimaryNamespace - Start-Sleep 10 + Start-TestSleep 10 } while($migrationConfig.ProvisioningState -ne 'Succeeded') Stop-AzServiceBusMigration -ResourceGroupName $env.resourceGroup -NamespaceName $env.migrationPrimaryNamespace do { $migrationConfig = Get-AzServiceBusMigration -ResourceGroupName $env.resourceGroup -NamespaceName $env.migrationPrimaryNamespace - Start-Sleep 10 + Start-TestSleep 10 } while($migrationConfig.ProvisioningState -ne 'Succeeded') $migrationConfig.TargetNamespace | Should -Be "" { Remove-AzServiceBusMigration -ResourceGroupName $env.resourceGroup -NamespaceName $env.migrationPrimaryNamespace } | Should -Throw - + $migrationConfig = Start-AzServiceBusMigration -ResourceGroupName $env.resourceGroup -NamespaceName $env.migrationPrimaryNamespace -PostMigrationName $env.postMigrationName -TargetNamespace $env.migrationSecondaryNamespaceResourceId $migrationConfig.Name | Should -Be $env.migrationPrimaryNamespace $migrationConfig.PostMigrationName | Should -Be $env.postMigrationName @@ -44,18 +44,18 @@ Describe 'Start-AzServiceBusMigration' { do { $migrationConfig = Get-AzServiceBusMigration -ResourceGroupName $env.resourceGroup -NamespaceName $env.migrationPrimaryNamespace - Start-Sleep 10 + Start-TestSleep 10 } while($migrationConfig.ProvisioningState -ne 'Succeeded') Complete-AzServiceBusMigration -ResourceGroupName $env.resourceGroup -NamespaceName $env.migrationPrimaryNamespace - - Start-Sleep 240 + + Start-TestSleep 240 $drConfig = Get-AzServiceBusGeoDRConfiguration -ResourceGroupName $env.resourceGroup -Name $env.migrationPrimaryNamespace -NamespaceName $env.migrationSecondaryNamespace $drConfig.Name | Should -Be $env.migrationPrimaryNamespace $drConfig.ResourceGroupName | Should -Be $env.resourceGroup $drConfig.PartnerNamespace | Should -Be "" $drConfig.Role | Should -Be "PrimaryNotReplicating" - + } } diff --git a/src/Synapse/Synapse.Autorest/test/Invoke-AzSynapseDetachKustoPoolFollowerDatabase.Tests.ps1 b/src/Synapse/Synapse.Autorest/test/Invoke-AzSynapseDetachKustoPoolFollowerDatabase.Tests.ps1 index 92024a41f12f..67f1f3a4a517 100644 --- a/src/Synapse/Synapse.Autorest/test/Invoke-AzSynapseDetachKustoPoolFollowerDatabase.Tests.ps1 +++ b/src/Synapse/Synapse.Autorest/test/Invoke-AzSynapseDetachKustoPoolFollowerDatabase.Tests.ps1 @@ -30,7 +30,7 @@ Describe 'Invoke-AzSynapseDetachKustoPoolFollowerDatabase' { New-AzSynapseKustoPoolDatabase -ResourceGroupName $resourceGroupName -WorkspaceName $workspaceName -KustoPoolName $kustoPoolName -Name $databaseName -Kind ReadWrite -Location $location New-AzSynapseKustoPoolAttachedDatabaseConfiguration -ResourceGroupName $resourceGroupName -WorkspaceName $workspaceName -KustoPoolName $followerKustoPoolName -Name $attachedDatabaseConfigurationName -Location $location -KustoPoolResourceId $kustoPoolResourceId -DatabaseName $databaseName -DefaultPrincipalsModificationKind $defaultPrincipalsModificationKind - Start-Sleep -Seconds 180 + Start-TestSleep -Seconds 180 { Invoke-AzSynapseDetachKustoPoolFollowerDatabase -ResourceGroupName $resourceGroupName -WorkspaceName $workspaceName -KustoPoolName $kustoPoolName -AttachedDatabaseConfigurationName $attachedDatabaseConfigurationName -KustoPoolResourceId $followerClusterResourceId } | Should -Not -Throw Remove-AzSynapseKustoPoolDatabase -ResourceGroupName $resourceGroupName -WorkspaceName $workspaceName -KustoPoolName $kustoPoolName -Name $databaseName } diff --git a/src/Synapse/Synapse.Autorest/test/Update-AzSynapseKustoPool.Tests.ps1 b/src/Synapse/Synapse.Autorest/test/Update-AzSynapseKustoPool.Tests.ps1 index 213580aec04f..772322af0dec 100644 --- a/src/Synapse/Synapse.Autorest/test/Update-AzSynapseKustoPool.Tests.ps1 +++ b/src/Synapse/Synapse.Autorest/test/Update-AzSynapseKustoPool.Tests.ps1 @@ -18,7 +18,7 @@ Describe 'Update-AzSynapseKustoPool' { It 'UpdateExpanded' { $updatedKustoPool = Update-AzSynapseKustoPool -ResourceGroupName $env.resourceGroupName -WorkspaceName $env.workspaceName -Name $env.kustoPoolName -SkuName $env.updatedSkuName -SkuSize $env.skuSize Validate_Cluster $updatedKustoPool $env.workspaceName $env.kustoPoolName $env.location "Running" "Succeeded" $env.resourceType $env.updatedSkuName $env.skuSize $env.capacity - Start-Sleep -Seconds 30 + Start-TestSleep -Seconds 30 } It 'UpdateViaIdentityExpanded' {