xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-11-04 05:12:32 +00:00
Code Issues Projects Releases Wiki Activity

Generate error on node/group misdeletion

Browse Source 
If requesting to delete a group from a node when that node is
not a member of that group, generate an error.

Similarly to delete a node from a group.
This commit is contained in:
Jarrod Johnson
2025-01-13 12:07:39 -05:00
parent e2bb72cc14
commit 32bc5afe03
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
confluent_server/confluent/config/configmanager.py
View File

@@ -1986,6 +1986,9 @@ class ConfigManager(object):
delnodes = noderange.NodeRange(
attribmap[group][attr]['remove'],
config=self).nodes
for node in delnodes:
if node not in currnodes:
raise ValueError('node "{0}" is not a member of {1}'.format(node, group))
attribmap[group][attr] = [
x for x in currnodes if x not in delnodes]
if not isinstance(attribmap[group][attr], list):
@@ -2442,6 +2445,9 @@ class ConfigManager(object):
elif attribmap[node]['groups'].get('remove', False):
delgroups = attribmap[node]['groups'][
'remove'].split(',')
for group in delgroups:
if group not in currgroups:
raise ValueError("node {0} is not a member of group {1}".format(node, group))
newgroups = [
x for x in currgroups if x not in delgroups]
attribmap[node]['groups'] = newgroups