1212# limitations under the License.
1313# ----------------------------------------------------------------------------------
1414
15+ $PLACEHOLDER = " PLACEHOLDER1@"
16+
1517<#
1618. SYNOPSIS
1719Tests Create-AzureVM with valid information.
@@ -33,8 +35,7 @@ function Test-GetAzureVM
3335
3436 # Test
3537 New-AzureService - ServiceName $svcName - Location $location
36- # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
37- New-AzureQuickVM - Windows - ImageName $imgName - Name $vmName - ServiceName $svcName - AdminUsername " pstestuser" - Password " p@ssw0rd"
38+ New-AzureQuickVM - Windows - ImageName $imgName - Name $vmName - ServiceName $svcName - AdminUsername " pstestuser" - Password $PLACEHOLDER
3839
3940 Get-AzureVM - ServiceName $svcName - Name $vmName
4041
@@ -92,7 +93,7 @@ function Run-StartAndStopMultipleVirtualMachinesTest
9293 $vmNameList = @ (" vm01" , " vm02" , " test04"
9394 $svcName = ' pstest' + (Get-CloudServiceName );
9495 $userName = " pstestuser"
95- $password = " p@ssw0rd "
96+ $password = $PLACEHOLDER ;
9697
9798 # Test
9899 New-AzureService - ServiceName $svcName - Location $location ;
@@ -153,7 +154,7 @@ function Run-AutoGeneratedHostedServiceCmdletTests
153154 $vmNameList = @ (" vm01" , " vm02" , " test04"
154155 $svcName = ' pstest' + (Get-CloudServiceName );
155156 $userName = " pstestuser"
156- $password = " p@ssw0rd "
157+ $password = $PLACEHOLDER ;
157158
158159 try
159160 {
@@ -220,7 +221,7 @@ function Run-AutoGeneratedVirtualMachineCmdletTests
220221
221222 $svcName = ' pstest' + (Get-CloudServiceName );
222223 $userName = " pstestuser"
223- $password = " p@ssw0rd "
224+ $password = $PLACEHOLDER ;
224225
225226 try
226227 {
@@ -480,7 +481,7 @@ function Run-ServiceExtensionSetCmdletTests
480481
481482 $svcName = ' pstest' + (Get-CloudServiceName );
482483 $userName = " pstestuser"
483- $password = " p@ssw0rd "
484+ $password = $PLACEHOLDER ;
484485 $sPassword = ConvertTo-SecureString $password - AsPlainText - Force;
485486 $credential = New-Object System.Management.Automation.PSCredential ($userName , $sPassword );
486487
@@ -542,7 +543,7 @@ function Run-ServiceDeploymentExtensionCmdletTests
542543
543544 $svcName = ' pstest' + (Get-CloudServiceName );
544545 $userName = " pstestuser"
545- $password = " p@ssw0rd "
546+ $password = $PLACEHOLDER ;
546547 $sPassword = ConvertTo-SecureString $password - AsPlainText - Force;
547548 $credential = New-Object System.Management.Automation.PSCredential ($userName , $sPassword );
548549
@@ -630,8 +631,7 @@ function Test-MigrateAzureDeployment
630631
631632 # Test
632633 New-AzureService - ServiceName $svcName - Location $location ;
633- # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
634- New-AzureQuickVM - Windows - ImageName $imgName - Name $vmName - ServiceName $svcName - AdminUsername " pstestuser" - Password " p@ssw0rd"
634+ New-AzureQuickVM - Windows - ImageName $imgName - Name $vmName - ServiceName $svcName - AdminUsername " pstestuser" - Password $PLACEHOLDER ;
635635 Get-AzureVM - ServiceName $svcName - Name $vmName ;
636636
637637 Move-AzureService - Prepare - ServiceName $svcName - DeploymentName $svcName - CreateNewVirtualNetwork;
@@ -670,10 +670,12 @@ function Test-MigrationAbortAzureDeployment
670670
671671 # Test
672672 New-AzureService - ServiceName $svcName - Location $location ;
673- # [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
674- New-AzureQuickVM - Windows - ImageName $imgName - Name $vmName - ServiceName $svcName - AdminUsername " pstestuser" - Password " p@ssw0rd"
673+ New-AzureQuickVM - Windows - ImageName $imgName - Name $vmName - ServiceName $svcName - AdminUsername " pstestuser" - Password $PLACEHOLDER - WaitForBoot;
675674 Get-AzureVM - ServiceName $svcName - Name $vmName ;
676675
676+ Move-AzureService - Validate - ServiceName $svcName - DeploymentName $svcName - CreateNewVirtualNetwork;
677+ $vm = Get-AzureVM - ServiceName $svcName - Name $vmName ;
678+
677679 Move-AzureService - Prepare - ServiceName $svcName - DeploymentName $svcName - CreateNewVirtualNetwork;
678680 $vm = Get-AzureVM - ServiceName $svcName - Name $vmName ;
679681 Assert-AreEqual " Prepared" $vm.VM.MigrationState ;
@@ -733,15 +735,15 @@ function Test-MigrationAbortAzureVNet
733735 # Test
734736
735737 Set-AzureVNetConfig - ConfigurationPath $vnetConfigPath ;
738+ Get-AzureVNetSite ;
736739
740+ Move-AzureVirtualNetwork - Validate - VirtualNetworkName $vnetName ;
737741 Get-AzureVNetSite ;
738742
739743 Move-AzureVirtualNetwork - Prepare - VirtualNetworkName $vnetName ;
740-
741744 Get-AzureVNetSite ;
742745
743746 Move-AzureVirtualNetwork - Abort - VirtualNetworkName $vnetName ;
744-
745747 Get-AzureVNetSite ;
746748
747749 # Cleanup
@@ -755,17 +757,17 @@ Tests Move-AzureStorageAccount with Prepare and Commit
755757function Test-MigrateAzureStorageAccount
756758{
757759 # Setup
758- $location = " Central US"
760+ $location = " Central US"
759761 $storageName = getAssetName;
760762 New-AzureStorageAccount - StorageAccountName $storageName - Location $location ;
761- Get-AzureStorageAccount - StorageAccountName $storageName ;
763+ Get-AzureStorageAccount - StorageAccountName $storageName ;
762764
763765 # Test
764766 Move-AzureStorageAccount - Prepare - StorageAccountName $storageName ;
765767 Get-AzureStorageAccount - StorageAccountName $storageName ;
766768
767769 Move-AzureStorageAccount - Commit - StorageAccountName $storageName ;
768- Assert-ThrowsContains { Get-AzureStorageAccount - StorageAccountName $storageName ; } " ResourceNotFound"
770+ Assert-ThrowsContains { Get-AzureStorageAccount - StorageAccountName $storageName ; } " ResourceNotFound"
769771}
770772
771773<#
@@ -775,12 +777,15 @@ Tests Move-AzureStorageAccount with Prepare and Abort
775777function Test-MigrationAbortAzureStorageAccount
776778{
777779 # Setup
778- $location = " Central US"
780+ $location = " Central US"
779781 $storageName = getAssetName;
780782 New-AzureStorageAccount - StorageAccountName $storageName - Location $location ;
781- Get-AzureStorageAccount - StorageAccountName $storageName ;
783+ Get-AzureStorageAccount - StorageAccountName $storageName ;
782784
783785 # Test
786+ Move-AzureStorageAccount - Validate - StorageAccountName $storageName ;
787+ Get-AzureStorageAccount - StorageAccountName $storageName ;
788+
784789 Move-AzureStorageAccount - Prepare - StorageAccountName $storageName ;
785790 Get-AzureStorageAccount - StorageAccountName $storageName ;
786791
@@ -806,7 +811,7 @@ function Test-NewAzureVMWithBYOL
806811 $licenseType = " Windows_Server"
807812 $imgName = getAssetName;
808813 $userName = " User" + $svcName ;
809- $pass = " User@ " + $svcName ;
814+ $pass = $PLACEHOLDER ;
810815
811816 $media1 = " http://mybyolosimagerdfe.blob.core.windows.net/myvhd/" + $svcName + " 0.vhd"
812817 $media2 = " http://mybyolosimagerdfe.blob.core.windows.net/myvhd/" + $svcName + " 1.vhd"
@@ -848,3 +853,42 @@ function Test-NewAzureVMWithBYOL
848853 # Cleanup
849854 Cleanup- CloudService $svcName
850855}
856+
857+ # Test Redeploy VM
858+ function Run-RedeployVirtualMachineTest
859+ {
860+ # Setup
861+ $location = Get-DefaultLocation ;
862+ $imgName = Get-DefaultImage $location ;
863+
864+ $storageName = ' pstest' + (getAssetName);
865+ New-AzureStorageAccount - StorageAccountName $storageName - Location $location ;
866+
867+ # Associate the new storage account with the current subscription
868+ Set-CurrentStorageAccountName $storageName ;
869+
870+ $vmName = " vm01"
871+ $svcName = ' pstest' + (Get-CloudServiceName );
872+ $userName = " pstestuser"
873+ $password = $PLACEHOLDER ;
874+
875+ # Test
876+ New-AzureService - ServiceName $svcName - Location $location ;
877+
878+ try
879+ {
880+ New-AzureQuickVM - Windows - ImageName $imgName - Name $vmName - ServiceName $svcName - AdminUsername $userName - Password $password ;
881+ # Get VM
882+ $vm = Get-AzureVM - ServiceName $svcName - Name $vmName ;
883+
884+ # Test Redeploy
885+ Restart-AzureVM - Redeploy - ServiceName $svcName - Name $vmName ;
886+
887+ $vm = Get-AzureVM - ServiceName $svcName - Name $vmName ;
888+ }
889+ finally
890+ {
891+ # Cleanup
892+ Cleanup- CloudService $svcName ;
893+ }
894+ }
0 commit comments