voltron/PowerCLI-Example-Scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for Find-HVMachine if no match is found in the first 1000 results

Browse Source 
If no match was found in the first 1000 results then the QueryService_GetNext() was never called as it used the length of the result array to detect the second pass through the loop
This commit is contained in:
mtelvers
2017-10-25 17:22:20 +01:00
parent 1edf24432c
commit dfd5a4e37e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1
View File

@@ -6910,19 +6910,22 @@ function Find-HVMachine {
$query.Filter = $andFilter $query.Filter = $andFilter
} }
$machineList = @() $machineList = @()
$GetNext = $false
$queryResults = $query_service_helper.QueryService_Create($services, $query) $queryResults = $query_service_helper.QueryService_Create($services, $query)
do { do {
if ($machineList.length -ne 0) { $queryResults = $query_service_helper.QueryService_GetNext($services, $queryResults.id) } if ($GetNext) { $queryResults = $query_service_helper.QueryService_GetNext($services, $queryResults.id) }
$machineList += $queryResults.results $machineList += $queryResults.results
$GetNext = $true
} while ($queryResults.remainingCount -gt 0) } while ($queryResults.remainingCount -gt 0)
$query_service_helper.QueryService_Delete($services, $queryResults.id) $query_service_helper.QueryService_Delete($services, $queryResults.id)
} }
if ($wildcard -or [string]::IsNullOrEmpty($machineList)) { if ($wildcard -or [string]::IsNullOrEmpty($machineList)) {
$query.Filter = $null $query.Filter = $null
$machineList = @() $machineList = @()
$GetNext = $false
$queryResults = $query_service_helper.QueryService_Create($services,$query) $queryResults = $query_service_helper.QueryService_Create($services,$query)
do { do {
if ($machineList.length -ne 0) { $queryResults = $query_service_helper.QueryService_GetNext($services, $queryResults.id) } if ($GetNext) { $queryResults = $query_service_helper.QueryService_GetNext($services, $queryResults.id) }
$strFilterSet = @() $strFilterSet = @()
foreach ($setting in $machineSelectors.Keys) { foreach ($setting in $machineSelectors.Keys) {
if ($null -ne $params[$setting]) { if ($null -ne $params[$setting]) {
@@ -6936,6 +6939,7 @@ function Find-HVMachine {
$whereClause = [string]::Join(' -and ', $strFilterSet) $whereClause = [string]::Join(' -and ', $strFilterSet)
$scriptBlock = [Scriptblock]::Create($whereClause) $scriptBlock = [Scriptblock]::Create($whereClause)
$machineList += $queryResults.results | where $scriptBlock $machineList += $queryResults.results | where $scriptBlock
$GetNext = $true
} while ($queryResults.remainingCount -gt 0) } while ($queryResults.remainingCount -gt 0)
$query_service_helper.QueryService_Delete($services, $queryResults.id) $query_service_helper.QueryService_Delete($services, $queryResults.id)
} }