mirror of
https://github.com/xcat2/confluent.git
synced 2025-02-11 16:24:41 +00:00
Pass through slot geometry if provided
This commit is contained in:
parent
b89ae4d74a
commit
0fadb00acf
@ -84,13 +84,14 @@ def retrieve(nodes, element, configmanager, inputdata):
|
||||
else:
|
||||
allnodedata[enclosure]['children'] = enclosuremap[enclosure]
|
||||
needheight = set([])
|
||||
needslots = set(enclosuremap)
|
||||
for node in allnodedata:
|
||||
if 'height' not in allnodedata[node]:
|
||||
needheight.add(node)
|
||||
needheight = ','.join(needheight)
|
||||
if needheight:
|
||||
needheightrange = ','.join(needheight.union(needslots))
|
||||
if needheightrange:
|
||||
for rsp in core.handle_path(
|
||||
'/noderange/{0}/description'.format(needheight),
|
||||
'/noderange/{0}/description'.format(needheightrange),
|
||||
'retrieve', configmanager,
|
||||
inputdata=None):
|
||||
if not hasattr(rsp, 'kvpairs'):
|
||||
@ -98,7 +99,10 @@ def retrieve(nodes, element, configmanager, inputdata):
|
||||
continue
|
||||
kvp = rsp.kvpairs
|
||||
for node in kvp:
|
||||
allnodedata[node]['height'] = kvp[node]['height']
|
||||
if node in needheight:
|
||||
allnodedata[node]['height'] = kvp[node]['height']
|
||||
if node in needslots:
|
||||
allnodedata[node]['slots'] = kvp[node]['slots']
|
||||
for node in allnodedata:
|
||||
if 'height' not in allnodedata[node]:
|
||||
allnodedata[node]['height'] = 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user