From bec878055351e56969c6e98a71b9c4863b0574dd Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 15 May 2023 10:57:55 -0500
Subject: [PATCH] update

---
 esxi-scripts/iscsi-vm-shutdown-verify.ps1 | 17 +++++++++++++++++
 powerwall.sh                              |  5 ++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100755 esxi-scripts/iscsi-vm-shutdown-verify.ps1

diff --git a/esxi-scripts/iscsi-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-vm-shutdown-verify.ps1
new file mode 100755
index 00000000..22e6fe71
--- /dev/null
+++ b/esxi-scripts/iscsi-vm-shutdown-verify.ps1
@@ -0,0 +1,17 @@
+#!/usr/bin/env pwsh
+
+. /opt/idssys/powerwall/settings.ps1
+
+Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword
+
+Get-Datastore | Where {$_.Name -like '*iSCSI1*' -or $_.Name -like '*iSCSI2*'} | Get-VM | if ($_.PowerState -eq "PoweredOn") {
+	Try{
+		$vm = Get-VM -Name $vmName -ErrorAction Stop
+		switch($vm.PowerState){
+			'poweredon' {
+				sleep 5
+			}
+		}
+	}
+
+}
diff --git a/powerwall.sh b/powerwall.sh
index 23a7b3f7..0fb90aa0 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -366,8 +366,11 @@ SHUTDOWN_SERVERS(){
 			echo -en "Stopping iSCSI VM's on: ${ESXIHOST} ... "
 			/opt/idssys/powerwall/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
 			echo "Done"
+			echo -en "Verifying iSCSI VM's stopped on: ${ESXIHOST} ... "
+			/opt/idssys/powerwall/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST}
+			echo "Done"
 		done
-		sleep 1m
+		# sleep 1m
 		for ESXIHOST in "${MAINHOSTS[@]}"; do
 			echo -en "Stopping Remaining VM's on: ${ESXIHOST} ... "
 			ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e true -t 0'