BVT tests - code cleanup.

2015-08-11 16:17:56 +05:30 · 2015-08-11 16:17:56 +05:30 · ba49d6adc7
--- a/remote-scripts/BVT-HVMODULES-CHECK.ps1
+++ b/remote-scripts/BVT-HVMODULES-CHECK.ps1
@ -6,10 +6,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-IS-ROOT-PASSWORD-DELETED.ps1
+++ b/remote-scripts/BVT-IS-ROOT-PASSWORD-DELETED.ps1
@ -8,10 +8,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-LAST-CONSOLE-CHECK.ps1
+++ b/remote-scripts/BVT-LAST-CONSOLE-CHECK.ps1
@ -8,10 +8,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-MTAB-ENTRY-CHECK.ps1
+++ b/remote-scripts/BVT-MTAB-ENTRY-CHECK.ps1
@ -8,11 +8,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-RESOURCE-DISK-FILESYSTEM.ps1
+++ b/remote-scripts/BVT-RESOURCE-DISK-FILESYSTEM.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-ROOT-DEVICE-TIMEOUT-CHECK.ps1
+++ b/remote-scripts/BVT-ROOT-DEVICE-TIMEOUT-CHECK.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-SWAP-CHECK.ps1
+++ b/remote-scripts/BVT-SWAP-CHECK.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-BOOT-ERROR-WARNINGS.ps1
+++ b/remote-scripts/BVT-VERIFY-BOOT-ERROR-WARNINGS.ps1
@ -8,10 +8,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-DISKSIZE.ps1
+++ b/remote-scripts/BVT-VERIFY-DISKSIZE.ps1
@ -8,19 +8,10 @@ if ($isDeployed)
 {
 	try
 	{
-		$testServiceData = Get-AzureService -ServiceName $isDeployed
-
-#Get VMs deployed in the service..
-		$testVMsinService = $testServiceData | Get-AzureVM
-
-		$hs1vm1 = $testVMsinService
-		$hs1vm1Endpoints = $hs1vm1 | Get-AzureEndpoint
-		$hs1vm1sshport = GetPort -Endpoints $hs1vm1Endpoints -usage ssh
-		$hs1VIP = $hs1vm1Endpoints[0].Vip
-		$hs1ServiceUrl = $hs1vm1.DNSName
-		$hs1ServiceUrl = $hs1ServiceUrl.Replace("http://","")
-		$hs1ServiceUrl = $hs1ServiceUrl.Replace("/","")
-		$hs1vm1Hostname =  $hs1vm1.Name
+		$hs1VIP = $AllVMData.PublicIP
+		$hs1vm1sshport = $AllVMData.SSHPort
+		$hs1ServiceUrl = $AllVMData.URL
+		$hs1vm1Dip = $AllVMData.InternalIP

 		$OsImageSize = Get-AzureVMImage | where {$_.ImageName -eq $BaseOsImage} | % {$_.LogicalSizeInGB}
 		$OsImageSizeKB = $OsImageSize*1024*1024*1024
--- a/remote-scripts/BVT-VERIFY-FIREWALL-STATUS.ps1
+++ b/remote-scripts/BVT-VERIFY-FIREWALL-STATUS.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-HOSTNAME.ps1
+++ b/remote-scripts/BVT-VERIFY-HOSTNAME.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-MNT-RESOURCE-README.ps1
+++ b/remote-scripts/BVT-VERIFY-MNT-RESOURCE-README.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-MNT-RESOURCE-WRITABLE.ps1
+++ b/remote-scripts/BVT-VERIFY-MNT-RESOURCE-WRITABLE.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-NO-ERROR-IN-LOGS.ps1
+++ b/remote-scripts/BVT-VERIFY-NO-ERROR-IN-LOGS.ps1
@ -10,7 +10,6 @@ if ($isDeployed)

 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
@ -19,7 +18,6 @@ if ($isDeployed)
 		RemoteCopy -uploadTo $hs1VIP -port $hs1vm1sshport -files $currentTestData.files -username $user -password $password -upload
 		RunLinuxCmd -username $user -password $password -ip $hs1VIP -port $hs1vm1sshport -command "chmod +x *" -runAsSudo

-
 		LogMsg "Executing : $($currentTestData.testScript)"
 		RunLinuxCmd -username $user -password $password -ip $hs1VIP -port $hs1vm1sshport -command "$python_cmd $($currentTestData.testScript)" -runAsSudo
 		RunLinuxCmd -username $user -password $password -ip $hs1VIP -port $hs1vm1sshport -command "mv Runtime.log $($currentTestData.testScript).log" -runAsSudo
--- a/remote-scripts/BVT-VERIFY-RESTART.ps1
+++ b/remote-scripts/BVT-VERIFY-RESTART.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-SHUTDOWN.ps1
+++ b/remote-scripts/BVT-VERIFY-SHUTDOWN.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-SSHD-CONFIG.ps1
+++ b/remote-scripts/BVT-VERIFY-SSHD-CONFIG.ps1
@ -8,7 +8,6 @@ if ($isDeployed)
 {
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-UUID-FSTAB.ps1
+++ b/remote-scripts/BVT-VERIFY-UUID-FSTAB.ps1
@ -9,7 +9,6 @@ if ($isDeployed)
 {
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-VERBOSE-ENABLED-LOGS.ps1
+++ b/remote-scripts/BVT-VERIFY-VERBOSE-ENABLED-LOGS.ps1
@ -7,10 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-VERIFY-VHD-PREREQUISITES.ps1
+++ b/remote-scripts/BVT-VERIFY-VHD-PREREQUISITES.ps1
@ -9,7 +9,6 @@ if ($isDeployed)

 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-WA-PROC-CHECK.ps1
+++ b/remote-scripts/BVT-WA-PROC-CHECK.ps1
@ -7,11 +7,8 @@ $resultArr = @()
 $isDeployed = DeployVMS -setupType $currentTestData.setupType -Distro $Distro -xmlConfig $xmlConfig
 if ($isDeployed)
 {
-
 	try
 	{
-
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL
--- a/remote-scripts/BVT-WA-VER-CHECK.ps1
+++ b/remote-scripts/BVT-WA-VER-CHECK.ps1
@ -8,7 +8,6 @@ if ($isDeployed)
 {
 	try
 	{
-		#$AllVMData = GetAllDeployementData -DeployedServices $isDeployed -ResourceGroups $isDeployed
 		$hs1VIP = $AllVMData.PublicIP
 		$hs1vm1sshport = $AllVMData.SSHPort
 		$hs1ServiceUrl = $AllVMData.URL