From e55ae20a29fc12aae8cb08e496cf91c52e80c764 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 13 Dec 2023 09:29:51 -0600
Subject: [PATCH] update

---
 esxi-scripts/iscsi-all-shutdown-verify.ps1    | 25 ++++++++-----------
 esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 | 24 ++++++++----------
 esxi-scripts/iscsi-vm-shutdown-verify.ps1     |  2 +-
 esxi-scripts/vm-shutdown-verify.ps1           | 25 ++++++++-----------
 4 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/esxi-scripts/iscsi-all-shutdown-verify.ps1 b/esxi-scripts/iscsi-all-shutdown-verify.ps1
index 87cd3fb6..3b62ba43 100755
--- a/esxi-scripts/iscsi-all-shutdown-verify.ps1
+++ b/esxi-scripts/iscsi-all-shutdown-verify.ps1
@@ -1,22 +1,17 @@
 #!/usr/bin/env pwsh
 
+# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false
 . /opt/idssys/powerwall/settings.ps1
 
-Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
-Get-Datastore | Where {$_.Name -like '*iSCSI-*'} | Get-VM | if ($_.PowerState -eq "PoweredOn") {
-	Try{
-		$vm = Get-VM -Name $vmName -ErrorAction Stop
-		switch($vm.PowerState){
-			'poweredon' {
-				sleep 5
-			}
-		}
-	}
-	Catch{
-	   Write-Host "VM '$($vmName)' not found!"
-	}
+$VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-*'} | Get-VM
+
+Foreach ($VM in $VMLIST) { 
+	while((Get-VM $VM).PowerState -ne 'PoweredOff') {
+		write-host waiting
+        Start-Sleep -Seconds 1
+    }
 }
 
-exit 0
-
+Disconnect-VIServer $ESXI -Confirm:$false
\ No newline at end of file
diff --git a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1
index 6e1b3b16..8a8b5daa 100755
--- a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1
+++ b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1
@@ -1,21 +1,17 @@
 #!/usr/bin/env pwsh
 
+# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false
 . /opt/idssys/powerwall/settings.ps1
 
-Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
-Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM | if ($_.PowerState -eq "PoweredOn") {
-	Try{
-		$vm = Get-VM -Name $vmName -ErrorAction Stop
-		switch($vm.PowerState){
-			'poweredon' {
-				sleep 5
-			}
-		}
-	}
-	Catch{
-	   Write-Host "VM '$($vmName)' not found!"
-	}
+$VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM
+
+Foreach ($VM in $VMLIST) { 
+	while((Get-VM $VM).PowerState -ne 'PoweredOff') {
+		write-host waiting
+        Start-Sleep -Seconds 1
+    }
 }
 
-exit 0
+Disconnect-VIServer $ESXI -Confirm:$false
\ No newline at end of file
diff --git a/esxi-scripts/iscsi-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-vm-shutdown-verify.ps1
index 34752cb1..f6b8d431 100755
--- a/esxi-scripts/iscsi-vm-shutdown-verify.ps1
+++ b/esxi-scripts/iscsi-vm-shutdown-verify.ps1
@@ -1,6 +1,6 @@
 #!/usr/bin/env pwsh
 
-Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false 
+# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false
 . /opt/idssys/powerwall/settings.ps1
 
 $ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
diff --git a/esxi-scripts/vm-shutdown-verify.ps1 b/esxi-scripts/vm-shutdown-verify.ps1
index fbf916e7..22845618 100755
--- a/esxi-scripts/vm-shutdown-verify.ps1
+++ b/esxi-scripts/vm-shutdown-verify.ps1
@@ -1,22 +1,17 @@
 #!/usr/bin/env pwsh
 
+# Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false
 . /opt/idssys/powerwall/settings.ps1
 
-Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+$ESXI = Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
 
-Get-Datastore | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'} | Get-VM | if ($_.PowerState -eq "PoweredOn") {
-	Try{
-		$vm = Get-VM -Name $vmName -ErrorAction Stop
-		switch($vm.PowerState){
-			'poweredon' {
-				sleep 5
-			}
-		}
-	}
-	Catch{
-	   Write-Host "VM '$($vmName)' not found!"
-	}
+$VMLIST = Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS*' -and $_.Name -notlike '*iSCSI*'}
+
+Foreach ($VM in $VMLIST) { 
+	while((Get-VM $VM).PowerState -ne 'PoweredOff') {
+		write-host waiting
+        Start-Sleep -Seconds 1
+    }
 }
 
-exit 0
-
+Disconnect-VIServer $ESXI -Confirm:$false
\ No newline at end of file