xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-29 20:37:39 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused nestedmode

Browse Source 
Without the ability to reliably tell a nodename from an input key,
must not do the nestedmode detection.
This commit is contained in:
Jarrod Johnson 2017-11-08 13:36:36 -05:00
parent cc4950ef75
commit 80864d78b3
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
confluent_server/confluent/messages.py
View File

@ -446,23 +446,13 @@ class InputExpression(ConfluentMessage):
# so that it can make it intact to the pertinent configmanager function
def __init__(self, path, inputdata, nodes=None):
self.nodeattribs = {}
nestedmode = False
if not inputdata:
raise exc.InvalidArgumentException('no request data provided')
if nodes is None:
self.attribs = inputdata
return
for node in nodes:
if node in inputdata:
nestedmode = True
self.nodeattribs[node] = inputdata[node]
if nestedmode:
for key in inputdata:
if key not in nodes:
raise exc.InvalidArgumentException
else:
for node in nodes:
self.nodeattribs[node] = inputdata
self.nodeattribs[node] = inputdata
def get_attributes(self, node):
if node not in self.nodeattribs:
@ -484,7 +474,6 @@ class InputAttributes(ConfluentMessage):
# to the client
def __init__(self, path, inputdata, nodes=None):
self.nodeattribs = {}
nestedmode = False
if not inputdata:
raise exc.InvalidArgumentException('no request data provided')
if nodes is None:
@ -509,16 +498,7 @@ class InputAttributes(ConfluentMessage):
'expression': self.attribs[attrib]}
return
for node in nodes:
if node in inputdata:
nestedmode = True
self.nodeattribs[node] = inputdata[node]
if nestedmode:
for key in inputdata:
if key not in nodes:
raise exc.InvalidArgumentException
else:
for node in nodes:
self.nodeattribs[node] = inputdata
self.nodeattribs[node] = inputdata
def get_attributes(self, node):
if node not in self.nodeattribs:
@ -555,7 +535,6 @@ class InputCredential(ConfluentMessage):
def __init__(self, path, inputdata, nodes=None):
self.credentials = {}
nestedmode = False
if not inputdata:
raise exc.InvalidArgumentException('no request data provided')