# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-#
-from types import StringTypes
import re
from PLC.Faults import *
from PLC.NodeTypes import NodeTypes
from PLC.BootStates import BootStates
from PLC.Interfaces import Interface, Interfaces
+from PLC.TagTypes import TagType, TagTypes
def valid_hostname(hostname):
# 1. Each part begins and ends with a letter or number.
table_name = 'nodes'
primary_key = 'node_id'
- join_tables = [ 'slice_node', 'peer_node', 'slice_tag',
- 'node_session', 'node_slice_whitelist',
- 'node_tag', 'conf_file_node', 'pcu_node', ]
+ join_tables = [ 'slice_node', 'peer_node', 'slice_tag',
+ 'node_session', 'node_slice_whitelist',
+ 'node_tag', 'conf_file_node', 'pcu_node', 'leases', ]
fields = {
'node_id': Parameter(int, "Node identifier"),
'node_type': Parameter(str,"Node type",max=20),
'site_id': Parameter(int, "Site at which this node is located"),
'boot_state': Parameter(str, "Boot state", max = 20),
'run_level': Parameter(str, "Run level", max = 20),
- 'extrainfo': Parameter(str, "Extra information about the host", max = 256),
'model': Parameter(str, "Make and model of the actual machine", max = 255, nullok = True),
'boot_nonce': Parameter(str, "(Admin only) Random value generated by the node at last boot", max = 128),
'version': Parameter(str, "Apparent Boot CD version", max = 64),
'ssh_rsa_key': Parameter(str, "Last known SSH host key", max = 1024),
'date_created': Parameter(int, "Date and time when node entry was created", ro = True),
'last_updated': Parameter(int, "Date and time when node entry was created", ro = True),
- 'last_contact': Parameter(int, "Date and time when node last contacted plc", ro = True),
+ 'last_contact': Parameter(int, "Date and time when node last contacted plc", ro = True),
+ 'last_boot': Parameter(int, "Date and time when node last booted", ro = True),
+ 'last_download': Parameter(int, "Date and time when node boot image was created", ro = True),
+ 'last_pcu_reboot': Parameter(int, "Date and time when PCU reboot was attempted", ro = True),
+ 'last_pcu_confirmation': Parameter(int, "Date and time when PCU reboot was confirmed", ro = True),
+ 'last_time_spent_online': Parameter(int, "Length of time the node was last online before shutdown/failure", ro = True),
+ 'last_time_spent_offline': Parameter(int, "Length of time the node was last offline after failure and before reboot", ro = True),
'verified': Parameter(bool, "Whether the node configuration is verified correct", ro=False),
'key': Parameter(str, "(Admin only) Node key", max = 256),
'session': Parameter(str, "(Admin only) Node session value", max = 256, ro = True),
'conf_file_ids': Parameter([int], "List of configuration files specific to this node"),
# 'root_person_ids': Parameter([int], "(Admin only) List of people who have root access to this node"),
'slice_ids': Parameter([int], "List of slices on this node"),
- 'slice_ids_whitelist': Parameter([int], "List of slices allowed on this node"),
+ 'slice_ids_whitelist': Parameter([int], "List of slices allowed on this node"),
'pcu_ids': Parameter([int], "List of PCUs that control this node"),
'ports': Parameter([int], "List of PCU ports that this node is connected to"),
'peer_id': Parameter(int, "Peer to which this node belongs", nullok = True),
'nodegroup_ids': Parameter([int], "List of node groups that this node is in"),
}
related_fields = {
- 'interfaces': [Mixed(Parameter(int, "Interface identifier"),
+ 'interfaces': [Mixed(Parameter(int, "Interface identifier"),
Filter(Interface.fields))],
- 'conf_files': [Parameter(int, "ConfFile identifier")],
- 'slices': [Mixed(Parameter(int, "Slice identifier"),
+ 'conf_files': [Parameter(int, "ConfFile identifier")],
+ 'slices': [Mixed(Parameter(int, "Slice identifier"),
Parameter(str, "Slice name"))],
- 'slices_whitelist': [Mixed(Parameter(int, "Slice identifier"),
+ 'slices_whitelist': [Mixed(Parameter(int, "Slice identifier"),
Parameter(str, "Slice name"))]
- }
+ }
view_tags_name = "view_node_tags"
# tags are used by the Add/Get/Update methods to expose tags
tags = { }
def validate_hostname(self, hostname):
+ hostname = hostname.lower()
if not valid_hostname(hostname):
- raise PLCInvalidArgument, "Invalid hostname"
+ raise PLCInvalidArgument("Invalid hostname")
conflicts = Nodes(self.api, [hostname])
for node in conflicts:
if 'node_id' not in self or self['node_id'] != node['node_id']:
- raise PLCInvalidArgument, "Hostname already in use"
+ raise PLCInvalidArgument("Hostname already in use")
return hostname
def validate_node_type(self, node_type):
node_types = [row['node_type'] for row in NodeTypes(self.api)]
if node_type not in node_types:
- raise PLCInvalidArgument, "Invalid node type %r"%node_type
+ raise PLCInvalidArgument("Invalid node type %r"%node_type)
return node_type
def validate_boot_state(self, boot_state):
boot_states = [row['boot_state'] for row in BootStates(self.api)]
if boot_state not in boot_states:
- raise PLCInvalidArgument, "Invalid boot state %r"%boot_state
+ raise PLCInvalidArgument("Invalid boot state %r"%boot_state)
return boot_state
validate_date_created = Row.validate_timestamp
validate_last_updated = Row.validate_timestamp
validate_last_contact = Row.validate_timestamp
+ validate_last_boot = Row.validate_timestamp
+ validate_last_download = Row.validate_timestamp
+ validate_last_pcu_reboot = Row.validate_timestamp
+ validate_last_pcu_confirmation = Row.validate_timestamp
- def update_last_contact(self, commit = True):
- """
- Update last_contact field with current time
- """
-
- assert 'node_id' in self
- assert self.table_name
+ def update_readonly_int(self, col_name, commit = True):
- self.api.db.do("UPDATE %s SET last_contact = CURRENT_TIMESTAMP " % (self.table_name) + \
- " where node_id = %d" % ( self['node_id']) )
- self.sync(commit)
+ assert 'node_id' in self
+ assert self.table_name
+ self.api.db.do("UPDATE %s SET %s = %s" % (self.table_name, col_name, self[col_name]) + \
+ " where node_id = %d" % (self['node_id']) )
+ self.sync(commit)
- def update_last_updated(self, commit = True):
+ def update_timestamp(self, col_name, commit = True):
"""
- Update last_updated field with current time
+ Update col_name field with current time
"""
assert 'node_id' in self
assert self.table_name
- self.api.db.do("UPDATE %s SET last_updated = CURRENT_TIMESTAMP " % (self.table_name) + \
+ self.api.db.do("UPDATE %s SET %s = CURRENT_TIMESTAMP " % (self.table_name, col_name) + \
" where node_id = %d" % (self['node_id']) )
self.sync(commit)
+ def update_last_boot(self, commit = True):
+ self.update_timestamp('last_boot', commit)
+ def update_last_download(self, commit = True):
+ self.update_timestamp('last_download', commit)
+ def update_last_pcu_reboot(self, commit = True):
+ self.update_timestamp('last_pcu_reboot', commit)
+ def update_last_pcu_confirmation(self, commit = True):
+ self.update_timestamp('last_pcu_confirmation', commit)
+
+ def update_last_contact(self, commit = True):
+ self.update_timestamp('last_contact', commit)
+ def update_last_updated(self, commit = True):
+ self.update_timestamp('last_updated', commit)
+
+ def update_tags(self, tags):
+ from PLC.Shell import Shell
+ from PLC.NodeTags import NodeTags
+ from PLC.Methods.AddNodeTag import AddNodeTag
+ from PLC.Methods.UpdateNodeTag import UpdateNodeTag
+ shell = Shell()
+ for (tagname,value) in tags.items():
+ # the tagtype instance is assumed to exist, just check that
+ if not TagTypes(self.api,{'tagname':tagname}):
+ raise PLCInvalidArgument("No such TagType %s"%tagname)
+ node_tags=NodeTags(self.api,{'tagname':tagname,'node_id':node['node_id']})
+ if not node_tags:
+ AddNodeTag(self.api).__call__(shell.auth,node['node_id'],tagname,value)
+ else:
+ UpdateNodeTag(self.api).__call__(shell.auth,node_tags[0]['node_tag_id'],value)
+
def associate_interfaces(self, auth, field, value):
- """
- Delete interfaces not found in value list (using DeleteInterface)
- Add interfaces found in value list (using AddInterface)
- Updates interfaces found w/ interface_id in value list (using UpdateInterface)
- """
+ """
+ Delete interfaces not found in value list (using DeleteInterface)
+ Add interfaces found in value list (using AddInterface)
+ Updates interfaces found w/ interface_id in value list (using UpdateInterface)
+ """
- assert 'interface_ids' in self
+ assert 'interface_ids' in self
assert 'node_id' in self
assert isinstance(value, list)
DeleteInterface.__call__(DeleteInterface(self.api), auth, stale_interface['interface_id'])
def associate_conf_files(self, auth, field, value):
- """
- Add conf_files found in value list (AddConfFileToNode)
- Delets conf_files not found in value list (DeleteConfFileFromNode)
- """
-
- assert 'conf_file_ids' in self
- assert 'node_id' in self
- assert isinstance(value, list)
-
- conf_file_ids = self.separate_types(value)[0]
-
- if self['conf_file_ids'] != conf_file_ids:
- from PLC.Methods.AddConfFileToNode import AddConfFileToNode
- from PLC.Methods.DeleteConfFileFromNode import DeleteConfFileFromNode
- new_conf_files = set(conf_file_ids).difference(self['conf_file_ids'])
- stale_conf_files = set(self['conf_file_ids']).difference(conf_file_ids)
-
- for new_conf_file in new_conf_files:
- AddConfFileToNode.__call__(AddConfFileToNode(self.api), auth, new_conf_file, self['node_id'])
- for stale_conf_file in stale_conf_files:
- DeleteConfFileFromNode.__call__(DeleteConfFileFromNode(self.api), auth, stale_conf_file, self['node_id'])
+ """
+ Add conf_files found in value list (AddConfFileToNode)
+ Delets conf_files not found in value list (DeleteConfFileFromNode)
+ """
+
+ assert 'conf_file_ids' in self
+ assert 'node_id' in self
+ assert isinstance(value, list)
+
+ conf_file_ids = self.separate_types(value)[0]
+
+ if self['conf_file_ids'] != conf_file_ids:
+ from PLC.Methods.AddConfFileToNode import AddConfFileToNode
+ from PLC.Methods.DeleteConfFileFromNode import DeleteConfFileFromNode
+ new_conf_files = set(conf_file_ids).difference(self['conf_file_ids'])
+ stale_conf_files = set(self['conf_file_ids']).difference(conf_file_ids)
+
+ for new_conf_file in new_conf_files:
+ AddConfFileToNode.__call__(AddConfFileToNode(self.api), auth, new_conf_file, self['node_id'])
+ for stale_conf_file in stale_conf_files:
+ DeleteConfFileFromNode.__call__(DeleteConfFileFromNode(self.api), auth, stale_conf_file, self['node_id'])
def associate_slices(self, auth, field, value):
- """
- Add slices found in value list to (AddSliceToNode)
- Delete slices not found in value list (DeleteSliceFromNode)
- """
-
- from PLC.Slices import Slices
-
- assert 'slice_ids' in self
- assert 'node_id' in self
- assert isinstance(value, list)
-
- (slice_ids, slice_names) = self.separate_types(value)[0:2]
-
- if slice_names:
- slices = Slices(self.api, slice_names, ['slice_id']).dict('slice_id')
- slice_ids += slices.keys()
-
- if self['slice_ids'] != slice_ids:
- from PLC.Methods.AddSliceToNodes import AddSliceToNodes
- from PLC.Methods.DeleteSliceFromNodes import DeleteSliceFromNodes
- new_slices = set(slice_ids).difference(self['slice_ids'])
- stale_slices = set(self['slice_ids']).difference(slice_ids)
-
- for new_slice in new_slices:
- AddSliceToNodes.__call__(AddSliceToNodes(self.api), auth, new_slice, [self['node_id']])
- for stale_slice in stale_slices:
- DeleteSliceFromNodes.__call__(DeleteSliceFromNodes(self.api), auth, stale_slice, [self['node_id']])
+ """
+ Add slices found in value list to (AddSliceToNode)
+ Delete slices not found in value list (DeleteSliceFromNode)
+ """
+
+ from PLC.Slices import Slices
+
+ assert 'slice_ids' in self
+ assert 'node_id' in self
+ assert isinstance(value, list)
+
+ (slice_ids, slice_names) = self.separate_types(value)[0:2]
+
+ if slice_names:
+ slices = Slices(self.api, slice_names, ['slice_id']).dict('slice_id')
+ slice_ids += list(slices.keys())
+
+ if self['slice_ids'] != slice_ids:
+ from PLC.Methods.AddSliceToNodes import AddSliceToNodes
+ from PLC.Methods.DeleteSliceFromNodes import DeleteSliceFromNodes
+ new_slices = set(slice_ids).difference(self['slice_ids'])
+ stale_slices = set(self['slice_ids']).difference(slice_ids)
+
+ for new_slice in new_slices:
+ AddSliceToNodes.__call__(AddSliceToNodes(self.api), auth, new_slice, [self['node_id']])
+ for stale_slice in stale_slices:
+ DeleteSliceFromNodes.__call__(DeleteSliceFromNodes(self.api), auth, stale_slice, [self['node_id']])
def associate_slices_whitelist(self, auth, field, value):
- """
- Add slices found in value list to whitelist (AddSliceToNodesWhitelist)
- Delete slices not found in value list from whitelist (DeleteSliceFromNodesWhitelist)
- """
+ """
+ Add slices found in value list to whitelist (AddSliceToNodesWhitelist)
+ Delete slices not found in value list from whitelist (DeleteSliceFromNodesWhitelist)
+ """
- from PLC.Slices import Slices
+ from PLC.Slices import Slices
- assert 'slice_ids_whitelist' in self
+ assert 'slice_ids_whitelist' in self
assert 'node_id' in self
assert isinstance(value, list)
- (slice_ids, slice_names) = self.separate_types(value)[0:2]
+ (slice_ids, slice_names) = self.separate_types(value)[0:2]
if slice_names:
slices = Slices(self.api, slice_names, ['slice_id']).dict('slice_id')
- slice_ids += slices.keys()
+ slice_ids += list(slices.keys())
if self['slice_ids_whitelist'] != slice_ids:
from PLC.Methods.AddSliceToNodesWhitelist import AddSliceToNodesWhitelist
for new_slice in new_slices:
AddSliceToNodesWhitelist.__call__(AddSliceToNodesWhitelist(self.api), auth, new_slice, [self['node_id']])
for stale_slice in stale_slices:
- DeleteSliceFromNodesWhitelist.__call__(DeleteSliceFromNodesWhitelist(self.api), auth, stale_slice, [self['node_id']])
-
+ DeleteSliceFromNodesWhitelist.__call__(DeleteSliceFromNodesWhitelist(self.api), auth, stale_slice, [self['node_id']])
+
def delete(self, commit = True):
"""
"""
assert 'node_id' in self
- assert 'interface_ids' in self
- # we need to clean up InterfaceTags, so handling interfaces as part of join_tables does not work
- for interface in Interfaces(self.api,self['interface_ids']):
- interface.delete()
+ # we need to clean up InterfaceTags, so handling interfaces as part of join_tables does not work
+ # federated nodes don't have interfaces though so for smooth transition from 4.2 to 4.3
+ if 'peer_id' in self and self['peer_id']:
+ pass
+ else:
+ assert 'interface_ids' in self
+ for interface in Interfaces(self.api,self['interface_ids']):
+ interface.delete()
# Clean up miscellaneous join tables
for table in self.join_tables:
self['deleted'] = True
self.sync(commit)
-
class Nodes(Table):
"""
Representation of row(s) from the nodes table in the
for tagname in self.tag_columns:
view= "%s left join %s using (%s)"%(view,Node.tagvalue_view_name(tagname),
Node.primary_key)
-
+
sql = "SELECT %s FROM %s WHERE deleted IS False" % \
- (", ".join(self.columns.keys()+self.tag_columns.keys()),view)
+ (", ".join(list(self.columns.keys())+list(self.tag_columns.keys())),view)
if node_filter is not None:
if isinstance(node_filter, (list, tuple, set)):
# Separate the list into integers and strings
- ints = filter(lambda x: isinstance(x, (int, long)), node_filter)
- strs = filter(lambda x: isinstance(x, StringTypes), node_filter)
+ ints = [x for x in node_filter if isinstance(x, int)]
+ strs = [x for x in node_filter if isinstance(x, str)]
node_filter = Filter(Node.fields, {'node_id': ints, 'hostname': strs})
sql += " AND (%s) %s" % node_filter.sql(api, "OR")
elif isinstance(node_filter, dict):
- allowed_fields=dict(Node.fields.items()+Node.tags.items())
+ allowed_fields=dict(list(Node.fields.items())+list(Node.tags.items()))
node_filter = Filter(allowed_fields, node_filter)
sql += " AND (%s) %s" % node_filter.sql(api, "AND")
- elif isinstance (node_filter, StringTypes):
- node_filter = Filter(Node.fields, {'hostname':[node_filter]})
+ elif isinstance (node_filter, str):
+ node_filter = Filter(Node.fields, {'hostname':node_filter})
sql += " AND (%s) %s" % node_filter.sql(api, "AND")
elif isinstance (node_filter, int):
- node_filter = Filter(Node.fields, {'node_id':[node_filter]})
+ node_filter = Filter(Node.fields, {'node_id':node_filter})
sql += " AND (%s) %s" % node_filter.sql(api, "AND")
else:
- raise PLCInvalidArgument, "Wrong node filter %r"%node_filter
+ raise PLCInvalidArgument("Wrong node filter %r"%node_filter)
self.selectall(sql)