+# $Id$
+# $URL$
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
can_update = lambda (field, value): field in \
['method', 'mac', 'gateway', 'network',
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,
+ 'primary_network': interface_fields,
'ssh_host_key': Node.fields['ssh_rsa_key']}
]
if node_fields.has_key('ssh_host_key'):
self.caller['ssh_rsa_key'] = node_fields['ssh_host_key']
- # Update primary node network state
+ # Update primary interface state
if node_fields.has_key('primary_network'):
primary_network = node_fields['primary_network']
- 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"
+ if 'interface_id' not in primary_network:
+ raise PLCInvalidArgument, "Interface not specified"
+ if primary_network['interface_id'] not in self.caller['interface_ids']:
+ raise PLCInvalidArgument, "Interface not associated with calling node"
- nodenetworks = NodeNetworks(self.api, [primary_network['nodenetwork_id']])
- if not nodenetworks:
- raise PLCInvalidArgument, "No such node network"
- nodenetwork = nodenetworks[0]
+ interfaces = Interfaces(self.api, [primary_network['interface_id']])
+ if not interfaces:
+ raise PLCInvalidArgument, "No such interface %r"%interface_id
+ interface = interfaces[0]
- if not nodenetwork['is_primary']:
- raise PLCInvalidArgument, "Not the primary node network on record"
+ if not interface['is_primary']:
+ raise PLCInvalidArgument, "Not the primary interface on record"
- nodenetwork_fields = dict(filter(can_update, primary_network.items()))
- nodenetwork.update(nodenetwork_fields)
- nodenetwork.sync(commit = False)
+ interface_fields = dict(filter(can_update, primary_network.items()))
+ interface.update(interface_fields)
+ interface.sync(commit = False)
+
+ # indicate that node has booted & contacted PLC.
+ if isinstance(self.caller, Node):
+ node = self.caller
+ node.update_last_contact()
self.caller.sync(commit = True)
- self.message = "Node updated: %s" % ", ".join(node_fields.keys())
+ self.message = "Node updated: %s" % ", ".join(node_fields.keys())
return 1