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

Rename 'groups' to 'nodegroups'

Browse Source 
As usergroups come to exist, make it obvious whether a group is user or node
bound. The attribute names stay the same (since the 'groups' of a 'node' is
clearly 'nodegroup')
This commit is contained in:
Jarrod Johnson 2014-07-25 14:32:04 -04:00
parent 12f939a533
commit 360bcc395c
4 changed files with 66 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -50,3 +50,4 @@ Traceback (most recent call last):
AttributeError: 'str' object has no attribute 'iterkeys'
-/detected/ collection
-SLP snooping: snoop for srvrequests, likel
-show power/state while session is believed to be good but will timeout

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

@ -416,8 +416,8 @@ class ConfigManager(object):
_cfgstore['main'] = {}
self._bg_sync_to_file()
self._cfgstore = _cfgstore['main']
if 'groups' not in self._cfgstore:
self._cfgstore['groups'] = {'everything': {'nodes': set()}}
if 'nodegroups' not in self._cfgstore:
self._cfgstore['nodegroups'] = {'everything': {'nodes': set()}}
self._bg_sync_to_file()
if 'nodes' not in self._cfgstore:
self._cfgstore['nodes'] = {}
@ -431,8 +431,8 @@ class ConfigManager(object):
self._bg_sync_to_file()
self.tenant = tenant
self._cfgstore = _cfgstore['tenant'][tenant]
if 'groups' not in self._cfgstore:
self._cfgstore['groups'] = {'everything': {}}
if 'nodegroups' not in self._cfgstore:
self._cfgstore['nodegroups'] = {'everything': {}}
if 'nodes' not in self._cfgstore:
self._cfgstore['nodes'] = {}
self._bg_sync_to_file()
@ -534,6 +534,42 @@ class ConfigManager(object):
except KeyError:
return None
def get_usergroup(self, groupname):
"""Get user group information from DB
:param groupname: Name of the group
Returns a dictionary describing parameters of a user group.
This may include the role for users in the group to receive
if no more specific information is found.
"""
try:
return copy.deepcopy(self._cfgstore['usergroups'][groupname])
except KeyError:
return None
def set_usergroup(self, groupname, attributemap):
"""Set usergroup attribute(s)
:param groupname: the name of teh group to modify
:param attributemap: The mapping of keys to values to set
"""
for attribute in attributemap.iterkeys():
self._cfgstore['usergroups'][attribute] = attributemap[attribute]
_mark_dirtykey('usergroups', groupname, self.tenant)
def create_usergroup(selfself, groupname, role="Administrator"):
if 'usergroups' not in self._cfgstore:
self._cfgstore['usergroups'] = {}
groupname = groupname.encode('utf-8')
if groupname in self._cfgstore['usergroups']:
raise Exception("Duplicate groupname requested")
self._cfgstore['usergroups'][groupname] = {'role': role}
_mark_dirtykey('usergroups', groupname, self.tenant)
def set_user(self, name, attributemap):
"""Set user attribute(s)
@ -602,10 +638,10 @@ class ConfigManager(object):
return node in self._cfgstore['nodes']
def is_nodegroup(self, nodegroup):
return nodegroup in self._cfgstore['groups']
return nodegroup in self._cfgstore['nodegroups']
def get_groups(self):
return self._cfgstore['groups'].iterkeys()
return self._cfgstore['nodegroups'].iterkeys()
def list_nodes(self):
try:
@ -614,7 +650,7 @@ class ConfigManager(object):
return []
def get_nodegroup_attributes(self, nodegroup, attributes=()):
cfgnodeobj = self._cfgstore['groups'][nodegroup]
cfgnodeobj = self._cfgstore['nodegroups'][nodegroup]
if not attributes:
attributes = cfgnodeobj.iterkeys()
nodeobj = {}
@ -655,7 +691,7 @@ class ConfigManager(object):
def _node_added_to_group(self, node, group, changeset):
try:
nodecfg = self._cfgstore['nodes'][node]
groupcfg = self._cfgstore['groups'][group]
groupcfg = self._cfgstore['nodegroups'][group]
except KeyError: # something did not exist, nothing to do
return
for attrib in groupcfg.iterkeys():
@ -695,13 +731,13 @@ class ConfigManager(object):
# in case
if not 'groups' in nodecfg:
return
for group in nodecfg['groups']:
if attrib in self._cfgstore['groups'][group]:
for group in nodecfg['nodegroups']:
if attrib in self._cfgstore['nodegroups'][group]:
if srcgroup is not None and group != srcgroup:
# skip needless deepcopy
return
nodecfg[attrib] = \
copy.deepcopy(self._cfgstore['groups'][group][attrib])
copy.deepcopy(self._cfgstore['nodegroups'][group][attrib])
nodecfg[attrib]['inheritedfrom'] = group
self._refresh_nodecfg(nodecfg, attrib, nodename,
changeset=changeset)
@ -712,19 +748,19 @@ class ConfigManager(object):
return
def _sync_groups_to_node(self, groups, node, changeset):
for group in self._cfgstore['groups'].iterkeys():
for group in self._cfgstore['nodegroups'].iterkeys():
if group not in groups:
if node in self._cfgstore['groups'][group]['nodes']:
self._cfgstore['groups'][group]['nodes'].discard(node)
if node in self._cfgstore['nodegroups'][group]['nodes']:
self._cfgstore['nodegroups'][group]['nodes'].discard(node)
self._node_removed_from_group(node, group, changeset)
_mark_dirtykey('groups', group, self.tenant)
_mark_dirtykey('nodegroups', group, self.tenant)
for group in groups:
if group not in self._cfgstore['groups']:
self._cfgstore['groups'][group] = {'nodes': set([node])}
_mark_dirtykey('groups', group, self.tenant)
elif node not in self._cfgstore['groups'][group]['nodes']:
self._cfgstore['groups'][group]['nodes'].add(node)
_mark_dirtykey('groups', group, self.tenant)
if group not in self._cfgstore['nodegroups']:
self._cfgstore['nodegroups'][group] = {'nodes': set([node])}
_mark_dirtykey('nodegroups', group, self.tenant)
elif node not in self._cfgstore['nodegroups'][group]['nodes']:
self._cfgstore['nodegroups'][group]['nodes'].add(node)
_mark_dirtykey('nodegroups', group, self.tenant)
# node was not already in given group, perform inheritence fixup
self._node_added_to_group(node, group, changeset)
@ -1026,7 +1062,8 @@ class ConfigManager(object):
_load_dict_from_dbm(['globals'], rootpath + "/globals")
_load_dict_from_dbm(['main', 'nodes'], rootpath + "/nodes")
_load_dict_from_dbm(['main', 'users'], rootpath + "/users")
_load_dict_from_dbm(['main', 'groups'], rootpath + "/groups")
_load_dict_from_dbm(['main', 'nodegroups'], rootpath + "/nodegroups")
_load_dict_from_dbm(['main', 'usergroups'], rootpath + "/usergroups")
try:
for tenant in os.listdir(rootpath + '/tenants/'):
_load_dict_from_dbm(
@ -1038,6 +1075,9 @@ class ConfigManager(object):
_load_dict_from_dbm(
['main', tenant, 'users'],
"%s/%s/users" % (rootpath, tenant))
_load_dict_from_dbm(
['main', tenant, 'usergroups'],
"%s/%s/usergroups" % (rootpath, tenant))
except OSError:
pass

4
confluent_server/confluent/core.py
View File

@ -79,7 +79,7 @@ def load_plugins():
pluginmap[plugin] = tmpmod
rootcollections = ['nodes/', 'groups/', 'users/']
rootcollections = ['nodes/', 'nodegroups/', 'users/']
class PluginRoute(object):
@ -277,7 +277,7 @@ def handle_path(path, operation, configmanager, inputdata=None):
del pathcomponents[-1]
if not pathcomponents: # root collection list
return enumerate_collections(rootcollections)
elif pathcomponents[0] == 'groups':
elif pathcomponents[0] == 'nodegroups':
if len(pathcomponents) < 2:
if operation == "create":
inputdata = msg.InputAttributes(pathcomponents, inputdata)

2
confluent_server/confluent/httpapi.py
View File

@ -161,7 +161,7 @@ def _authorize_request(env, operation):
httpsessions[sessionid]['expiry'] = time.time() + 90
name = httpsessions[sessionid]['name']
authdata = auth.authorize(
name, element=None,
name, element=None,
skipuserobj=httpsessions[sessionid]['skipuserobject'])
if (not authdata) and 'HTTP_AUTHORIZATION' in env:
name, passphrase = base64.b64decode(