Merge pull request #18 from chrisdonlan/cdln-improved-webrequest-succ…

…ess-check improved the web request success handling.
dell · Feb 23, 2024 · 1a26275 · 1a26275
2 parents 468722b + 070430d
commit 1a26275
Show file tree

Hide file tree

Showing 46 changed files with 88 additions and 88 deletions.
diff --git a/DellOpenManage/Private/Get-ApiAllData.ps1 b/DellOpenManage/Private/Get-ApiAllData.ps1
@@ -22,7 +22,7 @@ function Get-ApiAllData {
     $Data = @()
     $ContentType = "application/json"
     $Response = Invoke-WebRequest -UseBasicParsing -Uri $Url -Headers $Headers -Method Get
-    if ($Response.StatusCode -eq 200) {
+    if ($Response.StatusCode -in (200,201)) {
         $Info = $Response.Content | ConvertFrom-Json
         if ($Info.value) { 
             foreach ($Value in $Info.value) {
@@ -33,7 +33,7 @@ function Get-ApiAllData {
             }
             while($NextLinkUrl) {
                 $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $ContentType
-                if($NextLinkResponse.StatusCode -eq 200)
+                if($NextLinkResponse.StatusCode -in (200,201))
                 {
                     $NextLinkData = $NextLinkResponse.Content | ConvertFrom-Json
                     foreach ($NextLink in $NextLinkData.'value') {

diff --git a/DellOpenManage/Private/Wait-OnConfigurationBaseline.ps1 b/DellOpenManage/Private/Wait-OnConfigurationBaseline.ps1
@@ -76,7 +76,7 @@ Process {
         $Ctr++
         Start-Sleep -Seconds $SLEEP_INTERVAL
         $BaselineResponse = Invoke-WebRequest -Uri $BaselineUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($BaselineResponse.StatusCode -eq 200) {
+        if ($BaselineResponse.StatusCode -in (200,201)) {
             $BaselineInfo = $BaselineResponse.Content | ConvertFrom-Json
             foreach ($Baseline in $BaselineInfo.'value') {
                 if ($Baseline.Id -eq $BaselineId) {

diff --git a/DellOpenManage/Private/Wait-OnFirmwareBaseline.ps1 b/DellOpenManage/Private/Wait-OnFirmwareBaseline.ps1
@@ -76,7 +76,7 @@ Process {
         $Ctr++
         Start-Sleep -Seconds $SLEEP_INTERVAL
         $BaselineResponse = Invoke-WebRequest -Uri $BaselineUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($BaselineResponse.StatusCode -eq 200) {
+        if ($BaselineResponse.StatusCode -in (200,201)) {
             $BaselineInfo = $BaselineResponse.Content | ConvertFrom-Json
             foreach ($Baseline in $BaselineInfo.'value') {
                 if ($Baseline.Name -eq $BaselineName) {

diff --git a/DellOpenManage/Private/Wait-OnTemplate.ps1 b/DellOpenManage/Private/Wait-OnTemplate.ps1
@@ -82,7 +82,7 @@ Process {
         $Ctr++
         Start-Sleep -Seconds $SLEEP_INTERVAL
         $TemplateResponse = Invoke-WebRequest -Uri $TemplateUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($TemplateResponse.StatusCode -eq 200) {
+        if ($TemplateResponse.StatusCode -in (200,201)) {
             $TemplateInfo = $TemplateResponse.Content | ConvertFrom-Json
             $Status = [int]$TemplateInfo.value[0].Status
             Write-Verbose "Iteration $($Ctr): Status of $($TemplateId) is $($JOB_STATUS_MAP.$Status)"

diff --git a/DellOpenManage/Public/OME/Connect-OMEServer.ps1 b/DellOpenManage/Public/OME/Connect-OMEServer.ps1
@@ -80,7 +80,7 @@ param(
     $UserDetails = @{"UserName"=$OMEUserName;"Password"=$OMEPassword;"SessionType"="API"} | ConvertTo-Json
 
     $SessResponse = Invoke-WebRequest -Uri $SessionUrl -UseBasicParsing -Method Post -Body $UserDetails -ContentType $Type 
-    if ($SessResponse.StatusCode -eq 200 -or $SessResponse.StatusCode -eq 201) {
+    if ($SessResponse.StatusCode -in 200, 201) {
         $SessResponseData = $SessResponse.Content | ConvertFrom-Json
 
         $Token = [String]$SessResponse.Headers["X-Auth-Token"]
@@ -91,7 +91,7 @@ param(
         $AppInfoUrl = "https://$($OMEHost)/api/ApplicationService/Info"
         $AppInfoResponse = Invoke-WebRequest -Uri $AppInfoUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type 
         $AppVersion = [System.Version]"1.0.0"
-        if ($AppInfoResponse.StatusCode -eq 200 -or $AppInfoResponse.StatusCode -eq 201) {
+        if ($AppInfoResponse.StatusCode -in 200, 201) {
             $AppInfoResponseData = $AppInfoResponse.Content | ConvertFrom-Json
             Write-Verbose $($AppInfoResponseData)
             $AppVersion = [System.Version]$AppInfoResponseData.Version
@@ -108,4 +108,4 @@ param(
     } else {
         Write-Error "Unable to create a session with appliance $($OMEHost)"
     }
-}
+}
diff --git a/DellOpenManage/Public/OME/Copy-OMETemplate.ps1 b/DellOpenManage/Public/OME/Copy-OMETemplate.ps1
@@ -11,7 +11,7 @@ function Get-TemplateVlan($BaseUri, $ContentType, $Headers, $Template) {
     $NETWORK_HIERARCHY_VIEW = 4  # For Network hierarchy View in a Template
     $TemplateVlanUrl = $BaseUri + "/api/TemplateService/Templates($($Template.Id))/Views($($NETWORK_HIERARCHY_VIEW))/AttributeViewDetails"
     $TemplateVlanResponse = Invoke-WebRequest -Uri $TemplateVlanUrl -UseBasicParsing -Method Get -ContentType $ContentType -Headers $Headers
-    if ($TemplateVlanResponse.StatusCode -eq 200) {
+    if ($TemplateVlanResponse.StatusCode -in 200, 201) {
         $TemplateVlans = $TemplateVlanResponse.Content | ConvertFrom-Json
         $NICGroups = @()
         $NICBondingList = @()
@@ -188,7 +188,7 @@ Process {
         $NewTemplateId = $null
         Write-Verbose "Clone Template..."
         $TemplateResponse = Invoke-WebRequest -Uri $TemplateUrl -UseBasicParsing -Method Post -Body $TemplatePayload -ContentType $ContentType -Headers $Headers
-        if ($TemplateResponse.StatusCode -eq 200) {
+        if ($TemplateResponse.StatusCode -in 200, 201) {
             $NewTemplateId = [int]$TemplateResponse.Content
             Write-Verbose "Clone Template Success - Id $($NewTemplateId)"
         }
@@ -203,7 +203,7 @@ Process {
             Write-Verbose $CloneTemplateVlanPayload
             $TemplateUpdateNetworkUrl = $BaseUri + "/api/TemplateService/Actions/TemplateService.UpdateNetworkConfig"
             $TemplateVlanResponse = Invoke-WebRequest -Uri $TemplateUpdateNetworkUrl -UseBasicParsing -Method Post -Body $CloneTemplateVlanPayload -ContentType $ContentType -Headers $Headers
-            if ($TemplateVlanResponse.StatusCode -eq 200) {
+            if ($TemplateVlanResponse.StatusCode -in 200, 201) {
                 Write-Verbose "Clone Template Success - VLANs"
             }
         }

diff --git a/DellOpenManage/Public/OME/Edit-OMEDiscovery.ps1 b/DellOpenManage/Public/OME/Edit-OMEDiscovery.ps1
@@ -131,7 +131,7 @@ function Get-JobId($BaseUri, $Headers, $DiscoverConfigGroupId) {
     $JobId = -1
     $JobUrl = $BaseUri + "/api/DiscoveryConfigService/Jobs"
     $JobResponse = Invoke-WebRequest -UseBasicParsing -Uri $JobUrl -Headers $Headers -Method Get
-    if ($JobResponse.StatusCode -eq 200) {
+    if ($JobResponse.StatusCode -in 200, 201) {
         $JobInfo = $JobResponse.Content | ConvertFrom-Json
         $JobValues = $JobInfo.value
         foreach ($value in $JobValues) {
@@ -282,7 +282,7 @@ Process {
         $DiscoveryId = $Discovery.Id
         $DiscoverUrl = $BaseUri + "/api/DiscoveryConfigService/DiscoveryConfigGroups(" + $DiscoveryId + ")"
         $DiscoverResponse = Invoke-WebRequest -Uri $DiscoverUrl -UseBasicParsing -Method Put -Body $Payload -Headers $Headers -ContentType $Type
-        if ($DiscoverResponse.StatusCode -eq 200) {
+        if ($DiscoverResponse.StatusCode -in 200, 201) {
             Write-Verbose "Discovering devices...."
             Start-Sleep -Seconds 10
             $DiscoverInfo = $DiscoverResponse.Content | ConvertFrom-Json

diff --git a/DellOpenManage/Public/OME/Edit-OMEGroup.ps1 b/DellOpenManage/Public/OME/Edit-OMEGroup.ps1
@@ -163,7 +163,7 @@ Process {
 
         $GroupResponse = Invoke-WebRequest -Uri $GroupURL -UseBasicParsing -Headers $Headers -ContentType $Type -Method POST -Body $GroupPayload
         Write-Verbose "Updating group..."
-        if ($GroupResponse.StatusCode -eq 200) {
+        if ($GroupResponse.StatusCode -in 200, 201) {
             Write-Verbose "Group update successful!"
             return $GroupResponse.Content | ConvertFrom-Json
         }

diff --git a/DellOpenManage/Public/OME/Edit-OMESecurityBanner.ps1 b/DellOpenManage/Public/OME/Edit-OMESecurityBanner.ps1
@@ -58,7 +58,7 @@ Process {
         Write-Verbose $BannerPayload
         $BannerResponse = Invoke-WebRequest -Uri $BannerURL -UseBasicParsing -Headers $Headers -ContentType $Type -Method POST -Body $BannerPayload
         Write-Verbose "Updating banner text..."
-        if ($BannerResponse.StatusCode -eq 200) {
+        if ($BannerResponse.StatusCode -in 200, 201) {
             Write-Verbose "Banner update successfull!"
             return $true
         }

diff --git a/DellOpenManage/Public/OME/Get-OMEAlertDefinition.ps1 b/DellOpenManage/Public/OME/Get-OMEAlertDefinition.ps1
@@ -56,7 +56,7 @@ Process {
 
         $DefinitionCountUrl = $BaseUri + "/api/AlertService/AlertMessageDefinitions"
         $DeviceResponse = Invoke-WebRequest -Uri $DefinitionCountUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($DeviceResponse.StatusCode -eq 200)
+        if ($DeviceResponse.StatusCode -in 200, 201)
         {
             $DefinitionCountData = $DeviceResponse.Content | ConvertFrom-Json
             foreach ($Definition in $DefinitionCountData.'value') {
@@ -69,7 +69,7 @@ Process {
             while($NextLinkUrl)
             {
                 $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-                if($NextLinkResponse.StatusCode -eq 200)
+                if($NextLinkResponse.StatusCode -in 200, 201)
                 {
                     $NextLinkData = $NextLinkResponse.Content | ConvertFrom-Json
                     foreach ($Definition in $NextLinkData.'value') {

diff --git a/DellOpenManage/Public/OME/Get-OMEAlertPolicy.ps1 b/DellOpenManage/Public/OME/Get-OMEAlertPolicy.ps1
@@ -79,7 +79,7 @@ Process {
         }
         Write-Verbose $AlertPolicyUrl
         $AlertPolicyResponse = Invoke-WebRequest -Uri $AlertPolicyUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($AlertPolicyResponse.StatusCode -eq 200)
+        if ($AlertPolicyResponse.StatusCode -in 200, 201)
         {
             $AlertPolicyCountData = $AlertPolicyResponse.Content | ConvertFrom-Json
             foreach ($AlertPolicy in $AlertPolicyCountData.'value') {
@@ -94,7 +94,7 @@ Process {
             {
                 Write-Verbose $NextLinkUrl
                 $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-                if($NextLinkResponse.StatusCode -eq 200)
+                if($NextLinkResponse.StatusCode -in 200, 201)
                 {
                     $NextLinkData = $NextLinkResponse.Content | ConvertFrom-Json
                     foreach ($AlertPolicy in $NextLinkData.'value') {

diff --git a/DellOpenManage/Public/OME/Get-OMEApplicationSettings.ps1 b/DellOpenManage/Public/OME/Get-OMEApplicationSettings.ps1
@@ -45,7 +45,7 @@ limitations under the License.
 
             $JobURL = $BaseUri + "/api/ApplicationService/Actions/ApplicationService.GetConfiguration"
             $JobResp = Invoke-WebRequest -Uri $JobURL -UseBasicParsing -Headers $Headers -ContentType $Type -Method POST -Body $null
-            if ($JobResp.StatusCode -eq 200) {
+            if ($JobResp.StatusCode -in 200, 201) {
                 Write-Verbose "Application settings job submitted successful..."
                 $JobInfo = $JobResp.Content | ConvertFrom-Json
                 $JobInfo
@@ -61,4 +61,4 @@ limitations under the License.
 
     End {}
 
-}
+}
diff --git a/DellOpenManage/Public/OME/Get-OMECatalog.ps1 b/DellOpenManage/Public/OME/Get-OMECatalog.ps1
@@ -63,7 +63,7 @@ Process {
 
         $CatalogData = @()
         $CatalogResp = Invoke-WebRequest -Uri $CatalogUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($CatalogResp.StatusCode -eq 200) {
+        if ($CatalogResp.StatusCode -in 200, 201) {
             $CatalogInfo = $CatalogResp.Content | ConvertFrom-Json
             foreach ($Catalog in $CatalogInfo.'value') {
                 if ($Value.Count -gt 0 -and $FilterBy -eq "Id") {

diff --git a/DellOpenManage/Public/OME/Get-OMEConfigurationBaseline.ps1 b/DellOpenManage/Public/OME/Get-OMEConfigurationBaseline.ps1
@@ -63,7 +63,7 @@ Process {
 
         $BaselineData = @()
         $BaselineResp = Invoke-WebRequest -Uri $BaselineUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($BaselineResp.StatusCode -eq 200) {
+        if ($BaselineResp.StatusCode -in 200, 201) {
             $BaselineInfo = $BaselineResp.Content | ConvertFrom-Json
             foreach ($Baseline in $BaselineInfo.'value') {
                 if ($Value.Count -gt 0 -and $FilterBy -eq "Id") {
@@ -93,4 +93,4 @@ Process {
 
 End {}
 
-}
+}
diff --git a/DellOpenManage/Public/OME/Get-OMEConfigurationCompliance.ps1 b/DellOpenManage/Public/OME/Get-OMEConfigurationCompliance.ps1
@@ -82,7 +82,7 @@ Process {
         #    2 = "Not Compliant"
         #}
 
-        if ($Response.StatusCode -eq 200) {
+        if ($Response.StatusCode -in 200, 201) {
             $ComplData = $Response | ConvertFrom-Json
             $ComplianceDeviceList = $ComplData.'value'
 
@@ -92,7 +92,7 @@ Process {
             while($NextLinkUrl)
             {
                 $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method GET -Headers $Headers -ContentType $Type
-                if($NextLinkResponse.StatusCode -eq 200) {
+                if($NextLinkResponse.StatusCode -in 200, 201) {
                     $NextLinkData = $NextLinkResponse.Content | ConvertFrom-Json
                     $ComplianceDeviceList = $ComplianceDeviceList + $NextLinkData.'value'
                     if($NextLinkData.'@odata.nextLink')

diff --git a/DellOpenManage/Public/OME/Get-OMEDevice.ps1 b/DellOpenManage/Public/OME/Get-OMEDevice.ps1
@@ -114,7 +114,7 @@ Process {
             $GroupUrl = "https://$($SessionAuth.Host)/api/GroupService/Groups"
             $GroupUrl += "(" + [String]($Group.Id) + ")/Devices"
             $GroupResp = Invoke-WebRequest -Uri $GroupUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-            if ($GroupResp.StatusCode -eq 200) {
+            if ($GroupResp.StatusCode -in 200, 201) {
                 $GroupInfo = $GroupResp.Content | ConvertFrom-Json
                 $GroupData = $GroupInfo.'value'
                 $DeviceCount = $GroupInfo.'@odata.count'
@@ -127,7 +127,7 @@ Process {
                         $delta = $DeviceCount-$currDeviceCount 
                         $RemainingDeviceUrl = $GroupUrl+"?`$skip=$($currDeviceCount)&`$top=$($delta)"
                         $RemainingDeviceResp = Invoke-WebRequest -Uri $RemainingDeviceUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-                        if($RemainingDeviceResp.StatusCode -eq 200){
+                        if($RemainingDeviceResp.StatusCode -in 200, 201){
                             $RemainingDeviceInfo = $RemainingDeviceResp.Content | ConvertFrom-Json
                             foreach ($Device in $RemainingDeviceInfo.'value') {
                                 $DeviceData += New-DeviceFromJson -Device $Device
@@ -157,7 +157,7 @@ Process {
             $DeviceCountUrl = $DeviceCountUrl + "?" + $Filter
             Write-Verbose $DeviceCountUrl
             $DeviceResponse = Invoke-WebRequest -Uri $DeviceCountUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-            if ($DeviceResponse.StatusCode -eq 200)
+            if ($DeviceResponse.StatusCode -in 200, 201)
             {
                 $DeviceCountData = $DeviceResponse.Content | ConvertFrom-Json
                 foreach ($Device in $DeviceCountData.'value') {
@@ -171,7 +171,7 @@ Process {
                 {
                     Write-Verbose $NextLinkUrl
                     $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-                    if($NextLinkResponse.StatusCode -eq 200)
+                    if($NextLinkResponse.StatusCode -in 200, 201)
                     {
                         $NextLinkData = $NextLinkResponse.Content | ConvertFrom-Json
                         foreach ($Device in $NextLinkData.'value') {

diff --git a/DellOpenManage/Public/OME/Get-OMEDeviceDetail.ps1 b/DellOpenManage/Public/OME/Get-OMEDeviceDetail.ps1
@@ -66,7 +66,7 @@ Process {
             $InventoryUrl =  $BaseUri + "/api/DeviceService/Devices($($Devices.Id))/InventoryDetails('$($InventoryType)')"
         }
         $InventoryResp = Invoke-WebRequest -Uri $InventoryUrl -UseBasicParsing -Headers $Headers -Method Get -ContentType $Type
-        if ($InventoryResp.StatusCode -eq 200) {
+        if ($InventoryResp.StatusCode -in 200, 201) {
             $InventoryInfo = $InventoryResp.Content | ConvertFrom-Json
             if ($InventoryInfo.'value') {
                 $InventoryData = $InventoryInfo.'value'
@@ -102,4 +102,4 @@ Process {
 
 End {}
 
-}
+}
diff --git a/DellOpenManage/Public/OME/Get-OMEDiscovery.ps1 b/DellOpenManage/Public/OME/Get-OMEDiscovery.ps1
@@ -63,7 +63,7 @@ Process {
 
         $DiscoveryData = @()
         $DiscoveryResp = Invoke-WebRequest -Uri $DiscoveryUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($DiscoveryResp.StatusCode -eq 200) {
+        if ($DiscoveryResp.StatusCode -in 200, 201) {
             $DiscoveryInfo = $DiscoveryResp.Content | ConvertFrom-Json
             foreach ($Discovery in $DiscoveryInfo.'value') {
                 if ($Value.Count -gt 0 -and $FilterBy -eq "Id") {

diff --git a/DellOpenManage/Public/OME/Get-OMEFirmwareBaseline.ps1 b/DellOpenManage/Public/OME/Get-OMEFirmwareBaseline.ps1
@@ -64,7 +64,7 @@ Process {
 
         $BaselineData = @()
         $BaselineResp = Invoke-WebRequest -Uri $BaselineUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($BaselineResp.StatusCode -eq 200) {
+        if ($BaselineResp.StatusCode -in 200, 201) {
             $BaselineInfo = $BaselineResp.Content | ConvertFrom-Json
             foreach ($Baseline in $BaselineInfo.'value') {
                 if ($Value.Count -gt 0 -and $FilterBy -eq "Id") {
@@ -94,4 +94,4 @@ Process {
 
 End {}
 
-}
+}
diff --git a/DellOpenManage/Public/OME/Get-OMEFirmwareCompliance.ps1 b/DellOpenManage/Public/OME/Get-OMEFirmwareCompliance.ps1
@@ -137,7 +137,7 @@ Process {
             $UpdateActionSet += $UpdateAction
         }
 
-        if ($Response.StatusCode -eq 200) {
+        if ($Response.StatusCode -in 200, 201) {
             $ComplData = $Response | ConvertFrom-Json
             $ComplianceDeviceList = $ComplData.'value'
 
@@ -147,7 +147,7 @@ Process {
             while($NextLinkUrl)
             {
                 $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method GET -Headers $Headers -ContentType $Type
-                if($NextLinkResponse.StatusCode -eq 200) {
+                if($NextLinkResponse.StatusCode -in 200, 201) {
                     $NextLinkData = $NextLinkResponse.Content | ConvertFrom-Json
                     $ComplianceDeviceList = $ComplianceDeviceList + $NextLinkData.'value'
                     if($NextLinkData.'@odata.nextLink')

diff --git a/DellOpenManage/Public/OME/Get-OMEGroup.ps1 b/DellOpenManage/Public/OME/Get-OMEGroup.ps1
@@ -77,7 +77,7 @@ Process {
         $GroupUrl = $GroupUrl + "?" + $Filter
         Write-Verbose $GroupUrl
         $GrpResp = Invoke-WebRequest -Uri $GroupUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-        if ($GrpResp.StatusCode -eq 200) {
+        if ($GrpResp.StatusCode -in 200, 201) {
             $GroupInfo = $GrpResp.Content | ConvertFrom-Json
             foreach ($Group in $GroupInfo.'value') {
                 $GroupData += New-GroupFromJson $Group
@@ -90,7 +90,7 @@ Process {
             {
                 Write-Verbose $NextLinkUrl
                 $NextLinkResponse = Invoke-WebRequest -Uri $NextLinkUrl -UseBasicParsing -Method Get -Headers $Headers -ContentType $Type
-                if($NextLinkResponse.StatusCode -eq 200)
+                if($NextLinkResponse.StatusCode -in 200, 201)
                 {
                     $NextLinkData = $NextLinkResponse.Content | ConvertFrom-Json
                     foreach ($Group in $NextLinkData.'value') {
@@ -124,4 +124,4 @@ Process {
 
 End {}
 
-}
+}