arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finish xcoll, add some more objects to control formatting better, have NodeRange on pipeline attempt to join for chaining after xcoll

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15549 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-03-17 17:20:53 +00:00
parent ef8f762590
commit 9d374c1421
2 changed files with 137 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
xCAT-server/share/xcat/netboot/windows/xCAT.format.ps1xml
View File

@ -1,6 +1,90 @@
<?xml version="1.0" encoding="utf-8" ?>
<Configuration>
<ViewDefinitions>
<View>
<Name>children</Name>
<ViewSelectedBy>
<TypeName>MergedxCATNodeData</TypeName>
</ViewSelectedBy>
<GroupBy>
<PropertyName>NodeRange</PropertyName>
</GroupBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Width>24</Width>
</TableColumnHeader>
<TableColumnHeader>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<Wrap/>
<TableColumnItems>
<TableColumnItem>
<PropertyName>Description</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Data</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>children</Name>
<ViewSelectedBy>
<TypeName>MergedxCATSimpleNodeData</TypeName>
</ViewSelectedBy>
<GroupBy>
<PropertyName>NodeRange</PropertyName>
</GroupBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<Wrap/>
<TableColumnItems>
<TableColumnItem>
<PropertyName>Data</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>children</Name>
<ViewSelectedBy>
<TypeName>xCATSimpleNodeData</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
<TableColumnHeader>
<Width>12</Width>
</TableColumnHeader>
<TableColumnHeader>
</TableColumnHeader>
</TableHeaders>
<TableRowEntries>
<TableRowEntry>
<Wrap/>
<TableColumnItems>
<TableColumnItem>
<PropertyName>Node</PropertyName>
</TableColumnItem>
<TableColumnItem>
<PropertyName>Data</PropertyName>
</TableColumnItem>
</TableColumnItems>
</TableRowEntry>
</TableRowEntries>
</TableControl>
</View>
<View>
<Name>children</Name>
<ViewSelectedBy>
@ -12,7 +96,7 @@
<Width>12</Width>
</TableColumnHeader>
<TableColumnHeader>
<Width>20</Width>
<Width>24</Width>
</TableColumnHeader>
<TableColumnHeader>
</TableColumnHeader>

62
xCAT-server/share/xcat/netboot/windows/xCAT.psm1
View File

@ -103,8 +103,32 @@ Function Get-NodePower {
}
Function Merge-xCATData { #xcoll attempt
$groupeddata=$input|Group-Object -Property "node"
$hashbyoutput=@{}
foreach ($nodedata in $groupeddata) {
New-MergedxCATData $nodedata.Group
$gdata= NewMergedxCATData $nodedata.Group
if ($hashbyoutput.Contains($gdata.stringcontent)) {
$hashbyoutput.Get_Item($gdata.stringcontent).NodeList += $gdata.NodeList
} else {
$hashbyoutput.Add($gdata.stringcontent,$gdata)
}
}
$distinctoutput=$hashbyoutput.GetEnumerator()
foreach ($collateddata in $distinctoutput) {
$findata = $collateddata.Value
$findata.NodeRange=[string]::Join(",",$findata.NodeList)
$findata = $findata |select-object -excludeproperty NodeRangeHint,stringcontent *
$mobjname = 'MergedxCATSimpleNodeData'
foreach ($do in $findata.dataObjects) {
if ($do.description) {
$mobjname='MergedxCATNodeData'
break
}
}
foreach ($do in $findata.dataObjects) {
$do|Add-Member -MemberType NoteProperty -Name NodeRange -Value $findata.NodeRange
$do.PSObject.TypeNames.Insert(0,$mobjname)
$do
}
}
}
@ -155,8 +179,10 @@ Function Send-xCATCommand {
foreach ($nr in $xcatRequest.noderange) {
if ($nr -is [System.String]) {
$nrparts += $nr
} elseif ($nr.PSObject.TypeNames[0] -eq "xCATNodeData") {
} elseif ($nr.PSObject.TypeNames[0] -like "xCAT*Node*Data") {
$nrparts += $nr.Node
} elseif ($nr.PSObject.TypeNames[0] -like "Merge*xCAT*Node*Data") {
$nrparts += $nr.NodeRange
}
}
$xcatRequest.noderange=[string]::Join(",",$nrparts);
@ -184,7 +210,10 @@ Function Send-xCATCommand {
}
[xml]$response = $responsexml
foreach ($elem in $response.xcatresponse.node) {
New-xCATDataFromXmlElement $elem -NodeRangeHint $xcatRequest.noderange
NewxCATDataFromXmlElement $elem -NodeRangeHint $xcatRequest.noderange
}
foreach ($elem in $response.xcatresponse.error) {
Write-Error $elem
}
#$response.xcatresponse.node.name
#$response.xcatresponse.node.data
@ -192,28 +221,34 @@ Function Send-xCATCommand {
}
}
Function New-MergedxCATData { #takes an arbitrary number of nodeData objects and spits out one
Function NewMergedxCATData { #takes an arbitrary number of nodeData objects and spits out one
Param(
$nodeData
)
$myobj = @{}
$myobj.dataObjects=@()
$myobj.NodeRange = $nodeData[0].Node
$myobj.NodeList = @($nodeData[0].Node)
$myobj.NodeRangeHint = $nodeData[0].NodeRangeHint
$myobj.stringcontent = ""
$myobj.NodeRange = ""
foreach ($data in $nodeData) {
$rangedata = $data|select-object -ExcludeProperty Node *
$rangedata.PSObject.TypeNames.RemoveAt(0)
$rangedata = $data|select-object -ExcludeProperty Node,NodeRangeHint *
foreach ($dataseg in $rangedata) {
$myobj.stringcontent += $dataseg.Description+": "+$dataseg.Data+"`n"
}
$myobj.dataObjects = $myobj.dataObjects + $rangedata
}
$newobj = New-Object -TypeName PSObject -Prop $myobj
$newobj.PSObject.TypeNames.Insert(0,'xCATNodeRangeData')
$newobj.PSObject.TypeNames.Insert(0,'TempxCATNodeRangeData')
return $newobj
}
Function New-xCATDataFromXmlElement {
Function NewxCATDataFromXmlElement {
Param(
$xmlElement,
$NodeRangeHint
)
$myprops = @{}
$objname = 'xCATSimpleNodeData'
if ($NodeRangeHint) { #hypothetically, 'xcoll' implementation might find this handy
$myprops.NodeRangeHint=$NodeRangeHint
}
@ -221,6 +256,7 @@ Function New-xCATDataFromXmlElement {
$myprops.Node=$xmlElement.name
}
if ($xmlElement.data.desc) {
$objname = 'xCATNodeData'
$myprops.Description=$xmlElement.data.desc
}
if ($xmlElement.data.contents) {
@ -228,8 +264,13 @@ Function New-xCATDataFromXmlElement {
} else {
$myprops.Data=""
}
if ($xmlElement.error) {
$errstr= $xmlElement.name + ": " + $xmlElement.error
Write-Error $errstr
$myprops.ErrorData=$xmlElement.error
}
$myobj=New-Object -TypeName PSObject -Prop $myprops
$myobj.PSObject.TypeNames.Insert(0,'xCATNodeData')
$myobj.PSObject.TypeNames.Insert(0,$objname)
return $myobj
}
New-Alias -name rpower -value Set-NodePower
@ -237,6 +278,7 @@ New-Alias -name rvitals -value Get-Nodevitals
New-Alias -name rinv -value Get-NodeInventory
New-Alias -name rbeacon -value Set-NodeBeacon
New-Alias -name nodels -value Get-Nodes
New-Alias -name xcoll -value Merge-xCATData
Export-ModuleMember -function *-* -Alias *