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

Fix for formatting Get-HVMachineSummary and empty search results.

Browse Source 
Displays proper meesage for Get-HVMachine/Get-HVMAchineSummary, incase
of empty search results. Dispalying Agent sataus for
Get-HVMachineSummary result.
This commit is contained in:
praveenmathamsetty
2016-12-19 13:07:44 +05:30
parent 8b0750a94e
commit df17793ede
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Modules/VMware.Hv.Helper/VMware.HV.Helper.format.ps1xml
View File

@@ -29,7 +29,7 @@
<Label>User Assignment</Label> <Label>User Assignment</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
<Width>8</Width> <Width>7</Width>
<Label>Enabled</Label> <Label>Enabled</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
@@ -117,27 +117,27 @@
<TableControl> <TableControl>
<TableHeaders> <TableHeaders>
<TableColumnHeader> <TableColumnHeader>
<Width>16</Width> <Width>15</Width>
<Label>Machine</Label> <Label>Machine</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
<Width>16</Width> <Width>12</Width>
<Label>DesktopPool</Label> <Label>DesktopPool</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
<Width>16</Width> <Width>12</Width>
<Label>DNS Name</Label> <Label>DNS Name</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
<Width>16</Width> <Width>8</Width>
<Label>User</Label> <Label>User</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
<Width>16</Width> <Width>15</Width>
<Label>Host</Label> <Label>Host</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
<Width>8</Width> <Width>5</Width>
<Label>Agent</Label> <Label>Agent</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
@@ -145,9 +145,8 @@
<Label>Datastore</Label> <Label>Datastore</Label>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader> <TableColumnHeader>
<Width>10</Width> <Width>15</Width>
<Label>Status</Label> <Label>Status</Label>
<Alignment>Right</Alignment>
</TableColumnHeader> </TableColumnHeader>
</TableHeaders> </TableHeaders>
<TableRowEntries> <TableRowEntries>
@@ -169,13 +168,13 @@
<ScriptBlock>$_.ManagedMachineNamesData.HostName</ScriptBlock> <ScriptBlock>$_.ManagedMachineNamesData.HostName</ScriptBlock>
</TableColumnItem> </TableColumnItem>
<TableColumnItem> <TableColumnItem>
<ScriptBlock>$_.Data.AgentVersion</ScriptBlock> <ScriptBlock>$_.Base.AgentVersion</ScriptBlock>
</TableColumnItem> </TableColumnItem>
<TableColumnItem> <TableColumnItem>
<ScriptBlock>$_.ManagedMachineNamesData.DatastorePaths</ScriptBlock> <ScriptBlock>$_.ManagedMachineNamesData.DatastorePaths</ScriptBlock>
</TableColumnItem> </TableColumnItem>
<TableColumnItem> <TableColumnItem>
<ScriptBlock>$_.Data.BasicState</ScriptBlock> <ScriptBlock>$_.Base.BasicState</ScriptBlock>
</TableColumnItem> </TableColumnItem>
</TableColumnItems> </TableColumnItems>
</TableRowEntry> </TableRowEntry>
@@ -212,12 +211,16 @@
<ScriptBlock>$_.ManagedMachineNamesData.HostName</ScriptBlock> <ScriptBlock>$_.ManagedMachineNamesData.HostName</ScriptBlock>
</ListItem> </ListItem>
<ListItem> <ListItem>
<Label>Enabled</Label> <Label>Agent</Label>
<ScriptBlock>$_.Base.AgentVersion</ScriptBlock>
</ListItem>
<ListItem>
<Label>Datastore</Label>
<ScriptBlock>$_.ManagedMachineNamesData.DatastorePaths</ScriptBlock> <ScriptBlock>$_.ManagedMachineNamesData.DatastorePaths</ScriptBlock>
</ListItem> </ListItem>
<ListItem> <ListItem>
<Label>Sessions</Label> <Label>Status</Label>
<ScriptBlock>$_.Data.BasicState</ScriptBlock> <ScriptBlock>$_.Base.BasicState</ScriptBlock>
</ListItem> </ListItem>
</ListItems> </ListItems>
</ListEntry> </ListEntry>

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

@@ -5136,16 +5136,17 @@ function Get-HVMachine {
} }
$machineList = Find-HVMachine -Param $PSBoundParameters $machineList = Find-HVMachine -Param $PSBoundParameters
if (!$machineList) {
if ($full) { Write-Host "No Virtual Machine(s) Found with given search parameters"
$queryResults = @() break
$desktop_helper = New-Object VMware.Hv.MachineService
foreach ($id in $machineList.id) {
$info = $desktop_helper.Machine_Get($services,$id)
$queryResults += $info
}
$machineList = $queryResults
} }
$queryResults = @()
$desktop_helper = New-Object VMware.Hv.MachineService
foreach ($id in $machineList.id) {
$info = $desktop_helper.Machine_Get($services,$id)
$queryResults += $info
}
$machineList = $queryResults
return $machineList return $machineList
} }
@@ -5252,8 +5253,12 @@ function Get-HVMachineSummary {
} }
$machineList = Find-HVMachine -Param $PSBoundParameters $machineList = Find-HVMachine -Param $PSBoundParameters
if (!$machineList) {
Write-Host "No Virtual Machine(s) Found with given search parameters"
break
}
return $machineList return $machineList
} }
Export-ModuleMember Add-HVDesktop,Add-HVRDSServer,Connect-HVEvent,Disconnect-HVEvent,Get-HVEvent,Get-HVFarm,Get-HVFarmSummary,Get-HVPool,Get-HVPoolSummary,Get-HVMachine,Get-HVMachineSummary,Get-HVQueryResult,Get-HVQueryFilter,New-HVFarm,New-HVPool,Remove-HVFarm,Remove-HVPool,Set-HVFarm,Set-HVPool,Start-HVFarm,Start-HVPool