X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FBootUpdateNode.py;h=d7c85b3f610054ddf95190f05d1ba853b739d080;hb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;hp=31dbb37a8f4dbd720f4879e8a9559346b70196df;hpb=e347fc823bbba9d88a3fddf07d5c21024dfd1e55;p=plcapi.git diff --git a/PLC/Methods/BootUpdateNode.py b/PLC/Methods/BootUpdateNode.py index 31dbb37..d7c85b3 100644 --- a/PLC/Methods/BootUpdateNode.py +++ b/PLC/Methods/BootUpdateNode.py @@ -1,9 +1,12 @@ +import time + from PLC.Faults import * from PLC.Method import Method from PLC.Parameter import Parameter, Mixed -from PLC.Auth import Auth, BootAuth +from PLC.Auth import Auth, BootAuth, SessionAuth from PLC.Nodes import Node, Nodes -from PLC.NodeNetworks import NodeNetwork, NodeNetworks +from PLC.Interfaces import Interface, Interfaces +from PLC.Timestamp import * can_update = lambda (field, value): field in \ ['method', 'mac', 'gateway', 'network', @@ -19,45 +22,94 @@ class BootUpdateNode(Method): roles = ['node'] - nodenetwork_fields = dict(filter(can_update, NodeNetwork.fields.items())) + interface_fields = dict(filter(can_update, Interface.fields.items())) accepts = [ - BootAuth(), + Mixed(BootAuth(), SessionAuth()), {'boot_state': Node.fields['boot_state'], - 'primary_network': nodenetwork_fields, - 'ssh_host_key': Node.fields['ssh_rsa_key']} - ] + 'primary_network': interface_fields, + ### BEWARE that the expected formerly did not match the native Node field + # support both for now + 'ssh_rsa_key': Node.fields['ssh_rsa_key'], + 'ssh_host_key': Node.fields['ssh_rsa_key'], + }] returns = Parameter(int, '1 if successful') def call(self, auth, node_fields): + + if not isinstance(self.caller, Node): + raise PLCInvalidArgument,"Caller is expected to be a node" + + node = self.caller + + # log this event only if a change occured + # otherwise the db gets spammed with meaningless entries + changed_fields = [] # Update node state if node_fields.has_key('boot_state'): - self.caller['boot_state'] = node_fields['boot_state'] + if node['boot_state'] != node_fields['boot_state']: changed_fields.append('boot_state') + node['boot_state'] = node_fields['boot_state'] + ### for legacy BootManager if node_fields.has_key('ssh_host_key'): - self.caller['ssh_rsa_key'] = node_fields['ssh_host_key'] + if node['ssh_rsa_key'] != node_fields['ssh_host_key']: changed_fields.append('ssh_rsa_key') + node['ssh_rsa_key'] = node_fields['ssh_host_key'] + if node_fields.has_key('ssh_rsa_key'): + if node['ssh_rsa_key'] != node_fields['ssh_rsa_key']: changed_fields.append('ssh_rsa_key') + node['ssh_rsa_key'] = node_fields['ssh_rsa_key'] - # Update primary node network state + # Update primary interface state if node_fields.has_key('primary_network'): - primary_network = node_fields['primary_network'] + primary_network = node_fields['primary_network'] + + if 'interface_id' not in primary_network: + raise PLCInvalidArgument, "Interface not specified" + if primary_network['interface_id'] not in node['interface_ids']: + raise PLCInvalidArgument, "Interface not associated with calling node" + + interfaces = Interfaces(self.api, [primary_network['interface_id']]) + if not interfaces: + raise PLCInvalidArgument, "No such interface %r"%interface_id + interface = interfaces[0] + + if not interface['is_primary']: + raise PLCInvalidArgument, "Not the primary interface on record" + + interface_fields = dict(filter(can_update, primary_network.items())) + for field in interface_fields: + if interface[field] != primary_network[field] : changed_fields.append('Interface.'+field) + interface.update(interface_fields) + interface.sync(commit = False) + + current_time = int(time.time()) + + # ONLY UPDATE ONCE when the boot_state flag and ssh_rsa_key flag are NOT passed + if not node_fields.has_key('boot_state') and not node_fields.has_key('ssh_rsa_key'): + + # record times spent on and off line by comparing last_contact with previous value of last_boot + if node['last_boot'] and node['last_contact']: + # last_boot is when the machine last called this API function. + # last_contact is the last time NM or RLA pinged the API. + node['last_time_spent_online'] = node['last_contact'] - node['last_boot'] + node['last_time_spent_offline'] = current_time - Timestamp.cast_long(node['last_contact']) - if 'nodenetwork_id' not in primary_network: - raise PLCInvalidArgument, "Node network not specified" - if primary_network['nodenetwork_id'] not in self.caller['nodenetwork_ids']: - raise PLCInvalidArgument, "Node network not associated with calling node" + node.update_readonly_int('last_time_spent_online') + node.update_readonly_int('last_time_spent_offline') + changed_fields.append('last_time_spent_online') + changed_fields.append('last_time_spent_offline') - nodenetworks = NodeNetworks(self.api, [primary_network['nodenetwork_id']]) - if not nodenetworks: - raise PLCInvalidArgument, "No such node network" - nodenetwork = nodenetworks[0] + # indicate that node has booted & contacted PLC. + node.update_last_contact() + node.update_last_boot() - if not nodenetwork['is_primary']: - raise PLCInvalidArgument, "Not the primary node network on record" + # if last_pcu_reboot is within 20 minutes of current_time, accept that the PCU is responsible + if node['last_pcu_reboot'] and Timestamp.cast_long(node['last_pcu_reboot']) >= current_time - 60*20: + node.update_last_pcu_confirmation(commit=False) - nodenetwork_fields = dict(filter(can_update, primary_network.items())) - nodenetwork.update(nodenetwork_fields) - nodenetwork.sync(commit = False) + node.sync(commit = True) - self.caller.sync(commit = True) + if changed_fields: + self.message = "Boot updated: %s" % ", ".join(changed_fields) + self.event_objects = { 'Node' : [node['node_id']] } return 1