X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodeGroups.py;h=90bd5f90a3b051f8ec70a2a0293933a6c318a407;hb=238d5594712b9d918636501e754a8f5816313e25;hp=1a02200a5c0f52e4998a3d84df8bfc7b8f0ad1b6;hpb=09ff846b56dd358c70adc8f7e24e663ca41bb940;p=plcapi.git diff --git a/PLC/NodeGroups.py b/PLC/NodeGroups.py index 1a02200..90bd5f9 100644 --- a/PLC/NodeGroups.py +++ b/PLC/NodeGroups.py @@ -4,13 +4,14 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: NodeGroups.py,v 1.4 2006/09/12 16:08:50 tmack Exp $ +# $Id: NodeGroups.py,v 1.18 2006/11/09 03:07:42 mlhuang Exp $ # from types import StringTypes from PLC.Faults import * from PLC.Parameter import Parameter +from PLC.Filter import Filter from PLC.Debug import profile from PLC.Table import Row, Table from PLC.Nodes import Node, Nodes @@ -19,51 +20,32 @@ class NodeGroup(Row): """ Representation of a row in the nodegroups table. To use, optionally instantiate with a dict of values. Update as you would a - dict. Commit to the database with flush(). + dict. Commit to the database with sync(). """ + table_name = 'nodegroups' + primary_key = 'nodegroup_id' + join_tables = ['nodegroup_node', 'conf_file_nodegroup'] fields = { 'nodegroup_id': Parameter(int, "Node group identifier"), - 'name': Parameter(str, "Node group name"), - 'description': Parameter(str, "Node group description"), - 'is_custom': Parameter(bool, "Is a custom node group (i.e., is not a site node group)") - } - - # These fields are derived from join tables and are not - # actually in the nodegroups table. - join_fields = { + 'name': Parameter(str, "Node group name", max = 50), + 'description': Parameter(str, "Node group description", max = 200, nullok = True), 'node_ids': Parameter([int], "List of nodes in this node group"), + 'conf_file_ids': Parameter([int], "List of configuration files specific to this node group"), } - def __init__(self, api, fields): - Row.__init__(self, fields) - self.api = api - def validate_name(self, name): - #remove leading and trailing spaces - name = name.strip() - - #make sure name is not blank after we removed the spaces - if not len(name) > 0: - raise PLCInvalidArgument, "Invalid Node Group Name" + # Make sure name is not blank + if not len(name): + raise PLCInvalidArgument, "Invalid node group name" - #make sure name doenst alredy exist + # Make sure node group does not alredy exist conflicts = NodeGroups(self.api, [name]) for nodegroup_id in conflicts: if 'nodegroup_id' not in self or self['nodegroup_id'] != nodegroup_id: raise PLCInvalidArgument, "Node group name already in use" return name - - def validate_description(self, description): - #remove trailing and leading spaces - description = description.strip() - - #make sure decription is not blank after we removed the spaces - if not len(description) > 0: - raise PLCInvalidArgument, "Invalid Node Group Description" - - return description def add_node(self, node, commit = True): """ @@ -76,17 +58,18 @@ class NodeGroup(Row): node_id = node['node_id'] nodegroup_id = self['nodegroup_id'] - self.api.db.do("INSERT INTO nodegroup_nodes (nodegroup_id, node_id)" \ - " VALUES(%(nodegroup_id)d, %(node_id)d)", - locals()) - if commit: - self.api.db.commit() + if node_id not in self['node_ids']: + assert nodegroup_id not in node['nodegroup_ids'] - if 'node_ids' in self and node_id not in self['node_ids']: - self['node_ids'].append(node_id) + self.api.db.do("INSERT INTO nodegroup_node (nodegroup_id, node_id)" \ + " VALUES(%(nodegroup_id)d, %(node_id)d)", + locals()) + + if commit: + self.api.db.commit() - if 'nodegroup_ids' in node and nodegroup_id not in node['nodegroup_ids']: + self['node_ids'].append(node_id) node['nodegroup_ids'].append(nodegroup_id) def remove_node(self, node, commit = True): @@ -100,85 +83,20 @@ class NodeGroup(Row): node_id = node['node_id'] nodegroup_id = self['nodegroup_id'] - self.api.db.do("INSERT INTO nodegroup_nodes (nodegroup_id, node_id)" \ - " VALUES(%(nodegroup_id)d, %(node_id)d)", - locals()) - - if commit: - self.api.db.commit() - - if 'node_ids' in self and node_id not in self['node_ids']: - self['node_ids'].append(node_id) - if 'nodegroup_ids' in node and nodegroup_id not in node['nodegroup_ids']: - node['nodegroup_ids'].append(nodegroup_id) + if node_id in self['node_ids']: + assert nodegroup_id in node['nodegroup_ids'] - def flush(self, commit = True): - """ - Flush changes back to the database. - """ + self.api.db.do("DELETE FROM nodegroup_node" \ + " WHERE nodegroup_id = %(nodegroup_id)d" \ + " AND node_id = %(node_id)d", + locals()) - self.validate() - - # Fetch a new nodegroup_id if necessary - if 'nodegroup_id' not in self: - rows = self.api.db.selectall("SELECT NEXTVAL('nodegroups_nodegroup_id_seq') AS nodegroup_id") - if not rows: - raise PLCDBError, "Unable to fetch new nodegroup_id" - self['nodegroup_id'] = rows[0]['nodegroup_id'] - insert = True - else: - insert = False - - # Filter out fields that cannot be set or updated directly - fields = dict(filter(lambda (key, value): key in self.fields, - self.items())) - - # Parameterize for safety - keys = fields.keys() - values = [self.api.db.param(key, value) for (key, value) in fields.items()] - - if insert: - # Insert new row in nodegroups table - sql = "INSERT INTO nodegroups (%s) VALUES (%s)" % \ - (", ".join(keys), ", ".join(values)) - else: - # Update existing row in sites table - columns = ["%s = %s" % (key, value) for (key, value) in zip(keys, values)] - sql = "UPDATE nodegroups SET " + \ - ", ".join(columns) + \ - " WHERE nodegroup_id = %(nodegroup_id)d" - - self.api.db.do(sql, fields) - - if commit: - self.api.db.commit() - - - def delete(self, commit = True): - """ - Delete existing nodegroup from the database. - """ - - assert 'nodegroup_id' in self + if commit: + self.api.db.commit() - # Delete ourself - tables = ['nodegroup_nodes', 'override_bootscripts', - 'conf_assoc', 'node_root_access'] - - if self['is_custom']: - tables.append('nodegroups') - else: - # XXX Cannot delete site node groups yet - pass - - for table in tables: - self.api.db.do("DELETE FROM %s" \ - " WHERE nodegroup_id = %(nodegroup_id)" % \ - table, self) - - if commit: - self.api.db.commit() + self['node_ids'].remove(node_id) + node['nodegroup_ids'].remove(nodegroup_id) class NodeGroups(Table): """ @@ -186,31 +104,21 @@ class NodeGroups(Table): database. """ - def __init__(self, api, nodegroup_id_or_name_list = None): - self.api = api - - # N.B.: Node IDs returned may be deleted. - sql = "SELECT nodegroups.*, nodegroup_nodes.node_id" \ - " FROM nodegroups" \ - " LEFT JOIN nodegroup_nodes USING (nodegroup_id)" - - if nodegroup_id_or_name_list: - # Separate the list into integers and strings - nodegroup_ids = filter(lambda nodegroup_id: isinstance(nodegroup_id, (int, long)), - nodegroup_id_or_name_list) - names = filter(lambda name: isinstance(name, StringTypes), - nodegroup_id_or_name_list) - sql += " WHERE (False" - if nodegroup_ids: - sql += " OR nodegroup_id IN (%s)" % ", ".join(map(str, nodegroup_ids)) - if names: - sql += " OR name IN (%s)" % ", ".join(api.db.quote(names)).lower() - sql += ")" - - rows = self.api.db.selectall(sql) - for row in rows: - if self.has_key(row['nodegroup_id']): - nodegroup = self[row['nodegroup_id']] - nodegroup.update(row) - else: - self[row['nodegroup_id']] = NodeGroup(api, row) + def __init__(self, api, nodegroup_filter = None, columns = None): + Table.__init__(self, api, NodeGroup, columns) + + sql = "SELECT %s FROM view_nodegroups WHERE True" % \ + ", ".join(self.columns) + + if nodegroup_filter is not None: + if isinstance(nodegroup_filter, (list, tuple, set)): + # Separate the list into integers and strings + ints = filter(lambda x: isinstance(x, (int, long)), nodegroup_filter) + strs = filter(lambda x: isinstance(x, StringTypes), nodegroup_filter) + nodegroup_filter = Filter(NodeGroup.fields, {'nodegroup_id': ints, 'name': strs}) + sql += " AND (%s)" % nodegroup_filter.sql(api, "OR") + elif isinstance(nodegroup_filter, dict): + nodegroup_filter = Filter(NodeGroup.fields, nodegroup_filter) + sql += " AND (%s)" % nodegroup_filter.sql(api, "AND") + + self.selectall(sql)