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

Fix issues in expression enabled InputNetworkConfiguration

Browse Source 
This enables setting using expressions for any network configuration
functionality.
This commit is contained in:
Jarrod Johnson 2017-11-03 10:25:26 -04:00
parent 9f3fe01a49
commit 7f4ea287bc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
confluent_server/confluent/messages.py
View File

@ -740,11 +740,12 @@ class InputNetworkConfiguration(ConfluentInputMessage):
nodeattrmap = {}
for attr in inputdata:
try:
inputdata[attr].format()
if inputdata[attr] is not None:
inputdata[attr].format()
except (KeyError, IndexError):
nodeattrmap[attr] = {}
for expanded in cfm.expand_attrib_expression(nodes,
inputdata[attr]):
for expanded in configmanager.expand_attrib_expression(
nodes, inputdata[attr]):
node, value = expanded
nodeattrmap[attr][node] = value
if not nodeattrmap:
@ -756,7 +757,7 @@ class InputNetworkConfiguration(ConfluentInputMessage):
self.inputbynode[node] = deepcopy(inputdata)
for attr in self.inputbynode[node]:
if attr in nodeattrmap:
self.inputbynode[node][attr] = nodeattrmap[attr][node][attr]
self.inputbynode[node][attr] = nodeattrmap[attr][node]
def netconfig(self, node):
return self.inputbynode[node]