From f72f4cd2813ee0e6472059db053cbf32dea17831 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 27 Nov 2024 23:52:50 -0600
Subject: [PATCH] Update storage-test.sh

---
 storage-test.sh | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/storage-test.sh b/storage-test.sh
index 44ce73b..494843f 100755
--- a/storage-test.sh
+++ b/storage-test.sh
@@ -897,26 +897,6 @@ IOZone=$(echo "$IOZone" | sed '/^[[:space:]]*$/d' | grep -v 'Contrib\|Rhine\|Lan
 echo "$IOZone"
 Print_Style "RandRead: $IO4kRandRead - RandWrite: $IO4kRandWrite - Read: $IO4kRead - Write: $IO4kWrite" "$YELLOW"
 
-# Get brand information
-Print_Style "Enter a description or note" $GREEN
-read -r -t 0.001 </dev/tty
-read -r -p 'Description: ' Brand </dev/tty
-
-if [ -f /opt/idssys/dsmon/config.settings.inc ]; then
-	source /opt/idssys/dsmon/config.settings.inc
-	hostid=${SERVERMON_ID}
-else
-	hostid=''
-fi
-
-# Submit results
-Submit=$(curl -s -k -L --form "DDWriteSpeed=$DDWriteResult" --form "host=$hostid" --form "HDParmDisk=$HDParmDisk" --form "HDParmCached=$HDParmCached" --form "fio4kRandWriteIOPS=$fio4kRandWriteIOPS" --form "fio4kRandReadIOPS=$fio4kRandReadIOPS" --form "fio4kRandWriteSpeed=$fio4kRandWriteSpeed" --form "fio4kRandReadSpeed=$fio4kRandReadSpeed" --form "IO4kRandRead=$IO4kRandRead" --form "IO4kRandWrite=$IO4kRandWrite" --form "IO4kRead=$IO4kRead" --form "IO4kWrite=$IO4kWrite" --form "Drive=$BootDrive" --form "Model=$Model" --form "Capacity=$Capacity" --form "Manufacturer=$Manufacturer" --form "Product=$Product" --form "Note=$Brand" --form "HostModel=$HostModel" --form "HostCPUClock=$HostCPUClock" --form "HostCoreClock=$HostCoreClock" --form "HostRAMClock=$HostRAMClock" --form "HostArchitecture=$HostArchitecture" --form "HostOS=$HostOS" --form "HostManufacturer=$HostManufacturer" https://www.scity.us/storage_process.php)
-if [ "$(echo "$Submit" | grep '420')" != "" ]; then
-	echo "Result submitted successfully"
-else
-	echo "ERROR: Result submission failed"
-fi
-
 # Calculate score
 Score=$(echo "scale=2; $DDWriteResult * 1024" | bc)
 ScratchPad=$(echo "scale=2; $fio4kRandReadIOPS * 4" | bc)
@@ -931,6 +911,26 @@ ScratchPad=$(echo "scale=2; $IO4kRandWrite * 10" | bc)
 Score=$(echo "scale=2; $Score + $ScratchPad" | bc)
 Score=$(echo "scale=0; $Score / 100" | bc)
 
+# Get brand information
+Print_Style "Enter a description or note" $GREEN
+read -r -t 0.001 </dev/tty
+read -r -p 'Description: ' Brand </dev/tty
+
+if [ -f /opt/idssys/dsmon/config.settings.inc ]; then
+	source /opt/idssys/dsmon/config.settings.inc
+	hostid=${SERVERMON_ID}
+else
+	hostid=''
+fi
+
+# Submit results
+Submit=$(curl -s -k -L --form "DDWriteSpeed=$DDWriteResult" --form "host=$hostid" --form "score=$Score" --form "HDParmDisk=$HDParmDisk" --form "HDParmCached=$HDParmCached" --form "fio4kRandWriteIOPS=$fio4kRandWriteIOPS" --form "fio4kRandReadIOPS=$fio4kRandReadIOPS" --form "fio4kRandWriteSpeed=$fio4kRandWriteSpeed" --form "fio4kRandReadSpeed=$fio4kRandReadSpeed" --form "IO4kRandRead=$IO4kRandRead" --form "IO4kRandWrite=$IO4kRandWrite" --form "IO4kRead=$IO4kRead" --form "IO4kWrite=$IO4kWrite" --form "Drive=$BootDrive" --form "Model=$Model" --form "Capacity=$Capacity" --form "Manufacturer=$Manufacturer" --form "Product=$Product" --form "Note=$Brand" --form "HostModel=$HostModel" --form "HostCPUClock=$HostCPUClock" --form "HostCoreClock=$HostCoreClock" --form "HostRAMClock=$HostRAMClock" --form "HostArchitecture=$HostArchitecture" --form "HostOS=$HostOS" --form "HostManufacturer=$HostManufacturer" https://www.scity.us/storage_process.php)
+if [ "$(echo "$Submit" | grep '420')" != "" ]; then
+	echo "Result submitted successfully"
+else
+	echo "ERROR: Result submission failed"
+fi
+
 # Display results
 printf "\n$BRIGHT$UNDERLINE%-25s %-25s %-25s\n" "     Category" "     Test" '     Result     '"$NORMAL$CYAN"
 printf "%-25s %-25s %-25s\n" "HDParm" "Disk Read" "$HDParmDisk $HDParmDiskUnit"