Fixed issue where storage policies were not being cleaned up in upi-destroy.ps1.

Author: vr4manta

upi/vsphere/powercli/upi-destroy.ps1

@@ -36,7 +36,21 @@ foreach ($template in $templates) {
     Remove-Template -Template $($template.Entity) -DeletePermanently -confirm:$false
 }
 
-# Clean up storage policy
+# Clean up all resource pools
+$rps = Get-TagAssignment -Tag $tag -Entity (Get-ResourcePool)
+foreach ($rp in $rps) {
+    Write-Output "Removing resource pool $($rp.Entity)"
+    Remove-ResourcePool -ResourcePool $($rp.Entity) -confirm:$false
+}
+
+# Clean up all folders
+$folders = Get-TagAssignment -Tag $tag -Entity (Get-Folder)
+foreach ($folder in $folders) {
+    Write-Output "Removing folder $($folder.Entity)"
+    Remove-Folder -Folder $($folder.Entity) -DeletePermanently -confirm:$false
+}
+
+# Clean up storage policy.  Must be done after all other object cleanup except tag/tagCategory
 $storagePolicies = Get-SpbmStoragePolicy -Tag $tag
 
 foreach ($policy in $storagePolicies) {
@@ -47,7 +61,7 @@ foreach ($policy in $storagePolicies) {
     if ($splitResults.Count -eq 2) {
         $clusterId = $splitResults[1]
         if ($clusterId -ne "") {
-            Write-Host $clusterId
+            Write-Host "Checking for storage policies for "$clusterId
             $clusterInventory = @(Get-Inventory -Name "$($clusterId)*" -ErrorAction Continue)
 
             if ($clusterInventory.Count -eq 0) {
@@ -61,20 +75,6 @@ foreach ($policy in $storagePolicies) {
     }
 }
 
-# Clean up all resource pools
-$rps = Get-TagAssignment -Tag $tag -Entity (Get-ResourcePool)
-foreach ($rp in $rps) {
-    Write-Output "Removing resource pool $($rp.Entity)"
-    Remove-ResourcePool -ResourcePool $($rp.Entity) -confirm:$false
-}
-
-# Clean up all folders
-$folders = Get-TagAssignment -Tag $tag -Entity (Get-Folder)
-foreach ($folder in $folders) {
-    Write-Output "Removing folder $($folder.Entity)"
-    Remove-Folder -Folder $($folder.Entity) -DeletePermanently -confirm:$false
-}
-
 # Clean up tags
 Remove-Tag -Tag $tag -confirm:$false
 Remove-TagCategory -Category $tagCategory -confirm:$false