xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-19 20:16:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix type of height when pulled from attributes

Browse Source 
location.height was left as string, which fouled
further processing.
This commit is contained in:
Jarrod Johnson 2025-02-11 08:35:43 -05:00
parent 76d4556501
commit e87d6652ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
confluent_server/confluent/plugins/info/layout.py
View File

@ -67,7 +67,7 @@ def retrieve(nodes, element, configmanager, inputdata):
rackmap[row][rack][u] = {'node': enclosure, 'children': enclosuremap[enclosure]['bays'], 'nodecoordinates': enclosuremap[enclosure]['coordinates']}
allnodedata[enclosure] = rackmap[row][rack][u]
if height:
allnodedata[enclosure]['height'] = height
allnodedata[enclosure]['height'] = int(height)
else: # need to see if enclosure lands in the map naturally or need to pull it
needenclosures.add(enclosure)
elif u:
@ -78,7 +78,7 @@ def retrieve(nodes, element, configmanager, inputdata):
rackmap[row][rack][u] = {'node': node}
allnodedata[node] = rackmap[row][rack][u]
if height:
allnodedata[node]['height'] = height
allnodedata[node]['height'] = int(height)
locatednodes.add(node)
cfgenc = needenclosures - locatednodes
locationinfo = configmanager.get_node_attributes(cfgenc, (u'location.rack', u'location.row', u'location.u', u'location.height'))
@ -91,7 +91,7 @@ def retrieve(nodes, element, configmanager, inputdata):
if u:
allnodedata[enclosure] = {'node': enclosure, 'children': enclosuremap[enclosure]['bays'], 'nodecoordinates': enclosuremap[enclosure]['coordinates']}
if height:
allnodedata[enclosure]['height'] = height
allnodedata[enclosure]['height'] = int(height)
if row not in rackmap:
rackmap[row] = {}
if rack not in rackmap[row]: