Release 2.3.8

dell · Mar 11, 2022 · 1b51798 · 1b51798
1 parent 069770f
commit 1b51798
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 11 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -85,7 +85,7 @@ jobs:
 
   publish:
     name: Publish to PowerShell Gallery
-    needs: tests
+    needs: build
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.8]() - 2022-03-11
+### Added
+- Examples/DiscoverAddToStaticGroup.ps1 will run a Discovery, create a static group and add the devices to the group
+
+### Fixed
+- Fixed column ordering in Invoke-OMEReport to properly match Report
+- Fixed filtering with paged results in Get-OMEDevice. OME does not automatically add the filter parameters to @odata.nextLink 
+
 ## [2.3.7]() - 2022-02-16
 ### Added
 - Copy-OMETemplate

diff --git a/DellOpenManage/DellOpenManage.psd1 b/DellOpenManage/DellOpenManage.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Trevor Squillario <[email protected]>
 #
-# Generated on: 2/16/2022
+# Generated on: 3/11/2022
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'DellOpenManage.psm1'
 
 # Version number of this module.
-ModuleVersion = '2.3.7'
+ModuleVersion = '2.3.8'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/DellOpenManage/Public/OME/Get-OMEDevice.ps1 b/DellOpenManage/Public/OME/Get-OMEDevice.ps1
@@ -148,14 +148,17 @@ Process {
         }
         else { # Filter Devices directly
             $DeviceCountUrl = $BaseUri + "/api/DeviceService/Devices"
+            $Filter = ""
             if ($Value) { # Filter By 
                 if ($FilterBy -eq 'Id' -or $FilterBy -eq 'Type') {
-                    $DeviceCountUrl += "?`$filter=$($FilterExpr) eq $($Value)"
+                    $Filter += "`$filter=$($FilterExpr) eq $($Value)"
                 }
                 else {
-                    $DeviceCountUrl += "?`$filter=$($FilterExpr) eq '$($Value)'"
+                    $Filter += "`$filter=$($FilterExpr) eq '$($Value)'"
                 }
             }
+            $DeviceCountUrl = $DeviceCountUrl + "?" + $Filter
+            Write-Verbose $DeviceCountUrl
             $DeviceResponse = Invoke-WebRequest -Uri $DeviceCountUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
             if ($DeviceResponse.StatusCode -eq 200)
             {
@@ -165,10 +168,11 @@ Process {
                 }
                 if($DeviceCountData.'@odata.nextLink')
                 {
-                    $NextLinkUrl = $BaseUri + $DeviceCountData.'@odata.nextLink'
+                    $NextLinkUrl = $BaseUri + $DeviceCountData.'@odata.nextLink' + "&" + $Filter
                 }
                 while($NextLinkUrl)
                 {
+                    Write-Verbose $NextLinkUrl
                     $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
                     if($NextLinkResponse.StatusCode -eq 200)
                     {
@@ -178,7 +182,7 @@ Process {
                         }
                         if($NextLinkData.'@odata.nextLink')
                         {
-                            $NextLinkUrl = $BaseUri + $NextLinkData.'@odata.nextLink'
+                            $NextLinkUrl = $BaseUri + $NextLinkData.'@odata.nextLink' + "&" + $Filter
                         }
                         else
                         {
@@ -198,9 +202,7 @@ Process {
         return $DeviceData 
     } 
     Catch {
-        Write-Error ($_.ErrorDetails)
-        Write-Error ($_.Exception | Format-List -Force | Out-String) 
-        Write-Error ($_.InvocationInfo | Format-List -Force | Out-String)
+        Resolve-Error $_
     }
 }
 

diff --git a/DellOpenManage/Public/OME/Invoke-OMEReport.ps1 b/DellOpenManage/Public/OME/Invoke-OMEReport.ps1
@@ -40,7 +40,7 @@
                 }
                 foreach ($value in $ReportResultList) {
                     $resultVals = $value.Values
-                    $tempHash = @{}
+                    $tempHash = [ordered]@{}
                     for ($i =0; $i -lt $ColumnNames.Count; $i++) {
                         $tempHash[$ColumnNames[$i]] = $resultVals[$i]
                     }

diff --git a/Examples/DiscoverAddToStaticGroup.ps1 b/Examples/DiscoverAddToStaticGroup.ps1
@@ -0,0 +1,15 @@
+$GroupName = "TestGroup01"
+$Hosts = @("server01-idrac.example.com", "server02-idrac.example.com")
+
+New-OMEDiscovery -Name "TestDiscovery01" -Hosts $Hosts -DiscoveryUserName "root" -DiscoveryPassword $(ConvertTo-SecureString 'calvin' -AsPlainText -Force) -Wait -Verbose
+$Group = $($GroupName | Get-OMEGroup)
+# Create static group if not found
+if (-not $Group) {
+    New-OMEGroup $GroupName
+    $Group = $($GroupName | Get-OMEGroup)
+}
+# Loop through hosts and add to group by iDRAC DNS name
+$Hosts | Foreach-Object {
+    $Hostname = $_
+    $Group | Edit-OMEGroup -Devices $($Hostname | Get-OMEDevice -FilterBy "Name")
+}