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

Merge pull request #338 from freythman/master

Browse Source 
Fixes for VMware.Hv.Helper
This commit is contained in:
Kyle Ruddy
2020-01-08 12:58:04 -06:00
committed by GitHub
parent 5e66c56742 adfe78f236
commit 9c62ed266e
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/VMware.Hv.Helper/VMware.HV.Helper.psd1
View File

@@ -12,7 +12,7 @@
# RootModule = '' # RootModule = ''
# Version number of this module. # Version number of this module.
ModuleVersion = '1.3' ModuleVersion = '1.3.1'
# ID used to uniquely identify this module # ID used to uniquely identify this module
GUID = '6d3f7fb5-4e52-43d8-91e1-f65f72532a1d' GUID = '6d3f7fb5-4e52-43d8-91e1-f65f72532a1d'

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

@@ -1,5 +1,5 @@
#Script Module : VMware.Hv.Helper #Script Module : VMware.Hv.Helper
#Version : 1.3 #Version : 1.3.1
#Copyright © 2016 VMware, Inc. All Rights Reserved. #Copyright © 2016 VMware, Inc. All Rights Reserved.
@@ -3746,6 +3746,7 @@ function New-HVPool {
#desktopSpec.desktopSettings.logoffSettings.allowUsersToResetMachines #desktopSpec.desktopSettings.logoffSettings.allowUsersToResetMachines
[Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')] [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
[Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")] [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
[Parameter(Mandatory = $false,ParameterSetName = 'MANUAL')]
[boolean]$allowUsersToResetMachines = $false, [boolean]$allowUsersToResetMachines = $false,
#desktopSpec.desktopSettings.logoffSettings.allowMultipleSessionsPerUser #desktopSpec.desktopSettings.logoffSettings.allowMultipleSessionsPerUser
@@ -3777,23 +3778,27 @@ function New-HVPool {
#desktopSpec.desktopSettings.logoffSettings.supportedDisplayProtocols #desktopSpec.desktopSettings.logoffSettings.supportedDisplayProtocols
[Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')] [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
[Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")] [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
[Parameter(Mandatory = $false,ParameterSetName = 'MANUAL')]
[ValidateSet('RDP', 'PCOIP', 'BLAST')] [ValidateSet('RDP', 'PCOIP', 'BLAST')]
[string[]]$supportedDisplayProtocols = @('RDP', 'PCOIP', 'BLAST'), [string[]]$supportedDisplayProtocols = @('RDP', 'PCOIP', 'BLAST'),
#desktopSpec.desktopSettings.logoffSettings.defaultDisplayProtocol #desktopSpec.desktopSettings.logoffSettings.defaultDisplayProtocol
[Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')] [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
[Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")] [Parameter(Mandatory = $false,ParameterSetName = 'LINKED_CLONE')]
[Parameter(Mandatory = $false,ParameterSetName = 'MANUAL')]
[ValidateSet('RDP', 'PCOIP', 'BLAST')] [ValidateSet('RDP', 'PCOIP', 'BLAST')]
[string]$defaultDisplayProtocol = 'PCOIP', [string]$defaultDisplayProtocol = 'PCOIP',
#desktopSpec.desktopSettings.logoffSettings.allowUsersToChooseProtocol #desktopSpec.desktopSettings.logoffSettings.allowUsersToChooseProtocol
[Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')] [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
[Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")] [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
[Parameter(Mandatory = $false,ParameterSetName = 'MANUAL')]
[int]$allowUsersToChooseProtocol = $true, [int]$allowUsersToChooseProtocol = $true,
#desktopSpec.desktopSettings.logoffSettings.enableHTMLAccess #desktopSpec.desktopSettings.logoffSettings.enableHTMLAccess
[Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')] [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
[Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")] [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
[Parameter(Mandatory = $false,ParameterSetName = 'MANUAL')]
[boolean]$enableHTMLAccess = $false, [boolean]$enableHTMLAccess = $false,
# DesktopPCoIPDisplaySettings # DesktopPCoIPDisplaySettings
@@ -7767,7 +7772,7 @@ function Get-HVPoolSpec {
if (! $DesktopInfoPsObj.GlobalEntitlementData.GlobalEntitlement) { if (! $DesktopInfoPsObj.GlobalEntitlementData.GlobalEntitlement) {
$DesktopPsObj.GlobalEntitlementData = $null $DesktopPsObj.GlobalEntitlementData = $null
} else { } else {
$entityId.Id = $DesktopInfoPsObj.GlobalEntitlementData.GlobalEntitlement.Id $entityId = $DesktopInfoPsObj.GlobalEntitlementData.GlobalEntitlement
$DesktopPsObj.GlobalEntitlementData = Get-HVInternalName -EntityId $entityId $DesktopPsObj.GlobalEntitlementData = Get-HVInternalName -EntityId $entityId
} }
@@ -8025,7 +8030,13 @@ function Get-HVInternalName {
} }
'GlobalApplicationEntitlement' { 'GlobalApplicationEntitlement' {
$info = $services.GlobalApplicationEntitlement.GlobalApplicationEntitlement_Get($EntityId) $info = $services.GlobalApplicationEntitlement.GlobalApplicationEntitlement_Get($EntityId)
return $info.Base.displayName return $info.base.displayName
}
'GlobalEntitlement' {
$GlobalEntitlementID = New-Object VMware.Hv.GlobalEntitlementId
$GlobalEntitlementID.Id = $EntityID.Id
$info = $services.GlobalEntitlement.GlobalEntitlement_Get($GlobalEntitlementID)
return $info.base.displayname
} }
default { default {
$base64String = $tokens[$tokens.Length-1] $base64String = $tokens[$tokens.Length-1]