Refactor Get-AbrOntapStorageAggrDiagram for consistency in casing and improve readability of node management and aggregate handling

rebelinux · rebelinux · commit c3839a006550 · 2025-10-26T14:14:28.000-04:00
diff --git a/Src/Private/Get-AbrOntapNodeAggrDiagram.ps1 b/Src/Private/Get-AbrOntapNodeAggrDiagram.ps1
@@ -91,7 +91,7 @@ function Get-AbrOntapStorageAggrDiagram {
                                 "Mgmt" = switch ([string]::IsNullOrEmpty($NodeMgmtAddress)) {
                                     $true { "Unknown" }
                                     $false { $NodeMgmtAddress }
-                                    Default { "Unknown" }
+                                    default { "Unknown" }
                                 }
                             }
                         }
@@ -115,11 +115,11 @@ function Get-AbrOntapStorageAggrDiagram {
                                                     "raid0" { "RAID 0" }
                                                     "raid1" { "RAID 1" }
                                                     "raid10" { "RAID 10" }
-                                                    Default { "Unknown" }
+                                                    default { "Unknown" }
                                                 }
                                             }
                                         }
-                                        Default { "Unknown" }
+                                        default { "Unknown" }
                                     }
                                     "Raid Size" = $Aggr.RaidSize
                                     "State" = $Aggr.State
@@ -132,7 +132,7 @@ function Get-AbrOntapStorageAggrDiagram {
 
                     foreach ($Node in $NodeAdditionalInfo) {
                         $ClusterNodeObj = @()
-                        $ClusterNodeObj += Add-DiaHTMLNodeTable -ImagesObj $Images -inputObject $Node.NodeName -Align "Center" -iconType "Ontap_Node" -columnSize 1 -IconDebug $IconDebug -MultiIcon -AditionalInfo $Node.AdditionalInfo -Subgraph -SubgraphLabel $Node.NodeName -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 0 -SubgraphLabelFontsize 22 -fontSize 18
+                        $ClusterNodeObj += Add-DiaHtmlNodeTable -ImagesObj $Images -inputObject $Node.NodeName -Align "Center" -iconType "Ontap_Node" -ColumnSize 1 -IconDebug $IconDebug -MultiIcon -AditionalInfo $Node.AdditionalInfo -Subgraph -SubgraphLabel $Node.NodeName -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 0 -SubgraphLabelFontSize 22 -FontSize 18
 
                         if ($ClusterNodeObj) {
                             if ($AggrInfo.Count -eq 1) {
@@ -142,11 +142,11 @@ function Get-AbrOntapStorageAggrDiagram {
                             } else {
                                 $AggrInfoColumnSize = $AggrInfo.Count
                             }
-                            $ClusterNodeObj += Add-DiaHTMLNodeTable -ImagesObj $Images -inputObject ($AggrInfo | Where-Object { $_.NodeName -eq $Node.Nodename }).AggregateName -Align "Center" -iconType "Ontap_Aggregate" -columnSize $AggrInfoColumnSize -IconDebug $IconDebug -MultiIcon -AditionalInfo ($AggrInfo | Where-Object { $_.NodeName -eq $Node.Nodename }).AdditionalInfo -Subgraph -SubgraphLabel "Aggregates" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 1 -SubgraphLabelFontsize 22 -fontSize 18
+                            $ClusterNodeObj += Add-DiaHtmlNodeTable -ImagesObj $Images -inputObject ($AggrInfo | Where-Object { $_.NodeName -eq $Node.Nodename }).AggregateName -Align "Center" -iconType "Ontap_Aggregate" -ColumnSize $AggrInfoColumnSize -IconDebug $IconDebug -MultiIcon -AditionalInfo ($AggrInfo | Where-Object { $_.NodeName -eq $Node.Nodename }).AdditionalInfo -Subgraph -SubgraphLabel "Aggregates" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 1 -SubgraphLabelFontSize 22 -FontSize 18
                         }
 
                         if ($ClusterNodeObj) {
-                            $ClusterNodeSubgraphObj = Add-DiaHTMLSubGraph -ImagesObj $Images -TableArray $ClusterNodeObj -Align 'Center' -IconDebug $IconDebug -Label " " -LabelPos 'top' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 1 -columnSize 1 -fontSize 12
+                            $ClusterNodeSubgraphObj = Add-DiaHtmlSubGraph -ImagesObj $Images -TableArray $ClusterNodeObj -Align 'Center' -IconDebug $IconDebug -Label " " -LabelPos 'top' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 1 -ColumnSize 1 -FontSize 12
                         }
 
                         $ClusterNodesObj += $ClusterNodeSubgraphObj
@@ -160,10 +160,10 @@ function Get-AbrOntapStorageAggrDiagram {
                         } else {
                             $ClusterNodesObjColumnSize = $ClusterNodesObj.Count
                         }
-                        $ClusterMgmtObj = Add-DiaHTMLSubGraph -ImagesObj $Images -TableArray $ClusterNodesObj -Align 'Right' -IconDebug $IconDebug -Label "Management: $($ClusterInfo.NcController)" -LabelPos 'down' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 0 -columnSize $ClusterNodesObjColumnSize -fontSize 18
+                        $ClusterMgmtObj = Add-DiaHtmlSubGraph -ImagesObj $Images -TableArray $ClusterNodesObj -Align 'Right' -IconDebug $IconDebug -Label "Management: $($ClusterInfo.NcController.Name)" -LabelPos 'down' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 0 -ColumnSize $ClusterNodesObjColumnSize -FontSize 18
 
                         if ($ClusterMgmtObj) {
-                            Node Cluster @{Label = $ClusterMgmtObj; shape = 'plain'; fillColor = 'transparent'; fontsize = 14 }
+                            Node ClusterAggrs @{Label = $ClusterMgmtObj; shape = 'plain'; fillColor = 'transparent'; fontsize = 14 }
 
                         } else {
                             Write-PScriboMessage -IsWarning "Unable to create ClusterNodesObj. No Cluster Management Object found."

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ function Get-AbrOntapStorageAggrDiagram {`
`91`	`91`	`"Mgmt" = switch ([string]::IsNullOrEmpty($NodeMgmtAddress)) {`
`92`	`92`	`$true { "Unknown" }`
`93`	`93`	`$false { $NodeMgmtAddress }`
`94`		`- Default { "Unknown" }`
	`94`	`+ default { "Unknown" }`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`}`
`@@ -115,11 +115,11 @@ function Get-AbrOntapStorageAggrDiagram {`
`115`	`115`	`"raid0" { "RAID 0" }`
`116`	`116`	`"raid1" { "RAID 1" }`
`117`	`117`	`"raid10" { "RAID 10" }`
`118`		`- Default { "Unknown" }`
	`118`	`+ default { "Unknown" }`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`}`
`122`		`- Default { "Unknown" }`
	`122`	`+ default { "Unknown" }`
`123`	`123`	`}`
`124`	`124`	`"Raid Size" = $Aggr.RaidSize`
`125`	`125`	`"State" = $Aggr.State`
`@@ -132,7 +132,7 @@ function Get-AbrOntapStorageAggrDiagram {`
`132`	`132`
`133`	`133`	`foreach ($Node in $NodeAdditionalInfo) {`
`134`	`134`	`$ClusterNodeObj = @()`
`135`		`- $ClusterNodeObj += Add-DiaHTMLNodeTable -ImagesObj $Images -inputObject $Node.NodeName -Align "Center" -iconType "Ontap_Node" -columnSize 1 -IconDebug $IconDebug -MultiIcon -AditionalInfo $Node.AdditionalInfo -Subgraph -SubgraphLabel $Node.NodeName -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 0 -SubgraphLabelFontsize 22 -fontSize 18`
	`135`	`+ $ClusterNodeObj += Add-DiaHtmlNodeTable -ImagesObj $Images -inputObject $Node.NodeName -Align "Center" -iconType "Ontap_Node" -ColumnSize 1 -IconDebug $IconDebug -MultiIcon -AditionalInfo $Node.AdditionalInfo -Subgraph -SubgraphLabel $Node.NodeName -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 0 -SubgraphLabelFontSize 22 -FontSize 18`
`136`	`136`
`137`	`137`	`if ($ClusterNodeObj) {`
`138`	`138`	`if ($AggrInfo.Count -eq 1) {`
`@@ -142,11 +142,11 @@ function Get-AbrOntapStorageAggrDiagram {`
`142`	`142`	`} else {`
`143`	`143`	`$AggrInfoColumnSize = $AggrInfo.Count`
`144`	`144`	`}`
`145`		- $ClusterNodeObj += Add-DiaHTMLNodeTable -ImagesObj $Images -inputObject ($AggrInfo \| Where-Object { $_.NodeName -eq $Node.Nodename }).AggregateName -Align "Center" -iconType "Ontap_Aggregate" -columnSize $AggrInfoColumnSize -IconDebug $IconDebug -MultiIcon -AditionalInfo ($AggrInfo \| Where-Object { $_.NodeName -eq $Node.Nodename }).AdditionalInfo -Subgraph -SubgraphLabel "Aggregates" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 1 -SubgraphLabelFontsize 22 -fontSize 18
	`145`	+ $ClusterNodeObj += Add-DiaHtmlNodeTable -ImagesObj $Images -inputObject ($AggrInfo \| Where-Object { $_.NodeName -eq $Node.Nodename }).AggregateName -Align "Center" -iconType "Ontap_Aggregate" -ColumnSize $AggrInfoColumnSize -IconDebug $IconDebug -MultiIcon -AditionalInfo ($AggrInfo \| Where-Object { $_.NodeName -eq $Node.Nodename }).AdditionalInfo -Subgraph -SubgraphLabel "Aggregates" -SubgraphLabelPos "top" -SubgraphTableStyle "dashed,rounded" -TableBorderColor "#71797E" -TableBorder 1 -SubgraphLabelFontSize 22 -FontSize 18
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if ($ClusterNodeObj) {`
`149`		`- $ClusterNodeSubgraphObj = Add-DiaHTMLSubGraph -ImagesObj $Images -TableArray $ClusterNodeObj -Align 'Center' -IconDebug $IconDebug -Label " " -LabelPos 'top' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 1 -columnSize 1 -fontSize 12`
	`149`	`+ $ClusterNodeSubgraphObj = Add-DiaHtmlSubGraph -ImagesObj $Images -TableArray $ClusterNodeObj -Align 'Center' -IconDebug $IconDebug -Label " " -LabelPos 'top' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 1 -ColumnSize 1 -FontSize 12`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`$ClusterNodesObj += $ClusterNodeSubgraphObj`
`@@ -160,10 +160,10 @@ function Get-AbrOntapStorageAggrDiagram {`
`160`	`160`	`} else {`
`161`	`161`	`$ClusterNodesObjColumnSize = $ClusterNodesObj.Count`
`162`	`162`	`}`
`163`		`- $ClusterMgmtObj = Add-DiaHTMLSubGraph -ImagesObj $Images -TableArray $ClusterNodesObj -Align 'Right' -IconDebug $IconDebug -Label "Management: $($ClusterInfo.NcController)" -LabelPos 'down' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 0 -columnSize $ClusterNodesObjColumnSize -fontSize 18`
	`163`	`+ $ClusterMgmtObj = Add-DiaHtmlSubGraph -ImagesObj $Images -TableArray $ClusterNodesObj -Align 'Right' -IconDebug $IconDebug -Label "Management: $($ClusterInfo.NcController.Name)" -LabelPos 'down' -TableStyle "dashed,rounded" -TableBorderColor $Edgecolor -TableBorder 0 -ColumnSize $ClusterNodesObjColumnSize -FontSize 18`
`164`	`164`
`165`	`165`	`if ($ClusterMgmtObj) {`
`166`		`- Node Cluster @{Label = $ClusterMgmtObj; shape = 'plain'; fillColor = 'transparent'; fontsize = 14 }`
	`166`	`+ Node ClusterAggrs @{Label = $ClusterMgmtObj; shape = 'plain'; fillColor = 'transparent'; fontsize = 14 }`
`167`	`167`
`168`	`168`	`} else {`
`169`	`169`	`Write-PScriboMessage -IsWarning "Unable to create ClusterNodesObj. No Cluster Management Object found."`