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

Merge pull request #165 from mtelvers/master

Browse Source 
Updates to Remove-HVEntitlement
This commit is contained in:
Kyle Ruddy
2018-02-12 09:51:28 -05:00
committed by GitHub
parent e887ac3152 3e50b4ebde
commit 1fef21bad6
1 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8218,13 +8218,12 @@ function Remove-HVEntitlement {
$confirmFlag = Get-HVConfirmFlag -keys $PsBoundParameters.Keys $confirmFlag = Get-HVConfirmFlag -keys $PsBoundParameters.Keys
$AndFilter = @() $AndFilter = @()
$results = $null $results = $null
$userInfo = Get-UserInfo -UserName $User if ($User) {
$UserOrGroupName = $userInfo.Name $userInfo = Get-UserInfo -UserName $User
$Domain = $userInfo.Domain $AndFilter += Get-HVQueryFilter 'base.loginName' -Eq $userInfo.Name
$nameFilter = Get-HVQueryFilter 'base.name' -Eq $UserOrGroupName $AndFilter += Get-HVQueryFilter 'base.domain' -Eq $userInfo.Domain
$doaminFilter = Get-HVQueryFilter 'base.domain' -Eq $Domain }
$IsGroup = ($Type -eq 'Group') $AndFilter += Get-HVQueryFilter 'base.group' -Eq ($Type -eq 'Group')
$groupFilter = Get-HVQueryFilter 'base.group' -Eq $IsGroup
[VMware.Hv.UserEntitlementId[]] $userEntitlements = $null [VMware.Hv.UserEntitlementId[]] $userEntitlements = $null
if ($ResourceName) { if ($ResourceName) {
$info = $services.PodFederation.PodFederation_get() $info = $services.PodFederation.PodFederation_get()
@@ -8240,10 +8239,15 @@ function Remove-HVEntitlement {
$results = Get-HVQueryResult -EntityType EntitledUserOrGroupLocalSummaryView -Filter $filters -HvServer $HvServer $results = Get-HVQueryResult -EntityType EntitledUserOrGroupLocalSummaryView -Filter $filters -HvServer $HvServer
if ($results) { if ($results) {
foreach ($result in $Results) { foreach ($result in $Results) {
$userEntitlements = $result.localData.desktopUserEntitlements $deleteResources = @()
Write-Host $userEntitlements.Length " desktopUserEntitlement(s) will be removed for UserOrGroup " $user for ($i = 0; $i -lt $result.localdata.desktops.length; $i++) {
if ($ResourceObjs.Id.id -eq $result.localdata.Desktops[$i].id) {
$deleteResources += $result.localdata.DesktopUserEntitlements[$i]
}
}
Write-Host $deleteResources.Length " desktopUserEntitlement(s) will be removed for UserOrGroup " $user
if (!$confirmFlag -OR $pscmdlet.ShouldProcess($User)) { if (!$confirmFlag -OR $pscmdlet.ShouldProcess($User)) {
$services.UserEntitlement.UserEntitlement_DeleteUserEntitlements($userEntitlements) $services.UserEntitlement.UserEntitlement_DeleteUserEntitlements($deleteResources)
} }
} }
} }
@@ -8345,10 +8349,15 @@ function Remove-HVEntitlement {
$results = Get-HVQueryResult -EntityType EntitledUserOrGroupGlobalSummaryView -Filter $AndFilter -HvServer $HvServer $results = Get-HVQueryResult -EntityType EntitledUserOrGroupGlobalSummaryView -Filter $AndFilter -HvServer $HvServer
if ($results) { if ($results) {
foreach ($result in $Results) { foreach ($result in $Results) {
$userEntitlements = $result.globalData.globalUserEntitlements $deleteResources = @()
Write-Host $userEntitlements.Length " GlobalEntitlement(s) will be removed for UserOrGroup " $user for ($i = 0; $i -lt $result.globalData.globalEntitlements.length; $i++) {
if ($ResourceObjs.Id.id -eq $result.globalData.globalEntitlements[$i].id) {
$deleteResources += $result.globalData.globalUserEntitlements[$i]
}
}
Write-Host $deleteResources.Length " GlobalEntitlement(s) will be removed for UserOrGroup " $user
if (!$confirmFlag -OR $pscmdlet.ShouldProcess($User)) { if (!$confirmFlag -OR $pscmdlet.ShouldProcess($User)) {
$services.UserEntitlement.UserEntitlement_DeleteUserEntitlements($userEntitlements) $services.UserEntitlement.UserEntitlement_DeleteUserEntitlements($deleteResources)
} }
} }
@@ -8445,6 +8454,11 @@ PARAMETER Key
[Parameter(Mandatory = $false)] [Parameter(Mandatory = $false)]
$Value, $Value,
[Parameter(Mandatory = $false)]
[ValidatePattern("^.+?[@\\].+?$")]
[string]
$User,
[Parameter(Mandatory = $false)] [Parameter(Mandatory = $false)]
$HvServer = $null $HvServer = $null
) )
@@ -8472,6 +8486,11 @@ PARAMETER Key
$machineList.add($macineObj.id, $macineObj.base.Name) $machineList.add($macineObj.id, $macineObj.base.Name)
} }
} }
if ($machineList.count -eq 0) {
Write-Error "Machine $machineName not found - try fqdn"
[System.gc]::collect()
return
}
} elseif ($PSCmdlet.MyInvocation.ExpectingInput -or $Machine) { } elseif ($PSCmdlet.MyInvocation.ExpectingInput -or $Machine) {
foreach ($item in $machine) { foreach ($item in $machine) {
if (($item.GetType().name -eq 'MachineNamesView') -or ($item.GetType().name -eq 'MachineInfo')) { if (($item.GetType().name -eq 'MachineNamesView') -or ($item.GetType().name -eq 'MachineInfo')) {
@@ -8489,6 +8508,22 @@ PARAMETER Key
} elseif ($key -or $value) { } elseif ($key -or $value) {
Write-Error "Both key:[$key] and value:[$value] needs to be specified" Write-Error "Both key:[$key] and value:[$value] needs to be specified"
} }
if ($User) {
$userInfo = Get-UserInfo -UserName $User
$UserOrGroupName = $userInfo.Name
$Domain = $userInfo.Domain
$filter1 = Get-HVQueryFilter 'base.name' -Eq $UserOrGroupName
$filter2 = Get-HVQueryFilter 'base.domain' -Eq $Domain
$filter3 = Get-HVQueryFilter 'base.group' -Eq $false
$andFilter = Get-HVQueryFilter -And -Filters @($filter1, $filter2, $filter3)
$results = Get-HVQueryResult -EntityType ADUserOrGroupSummaryView -Filter $andFilter -HvServer $HvServer
if ($results.length -ne 1) {
Write-Host "Unable to find specific user with given search parameters"
[System.gc]::collect()
return
}
$updates += Get-MapEntry -key 'base.user' -value $results[0].id
}
if ($Maintenance) { if ($Maintenance) {
if ($Maintenance -eq 'ENTER_MAINTENANCE_MODE') { if ($Maintenance -eq 'ENTER_MAINTENANCE_MODE') {