X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateNode.py;h=a74db92a7e6979fcb8166cce493b6ce0f8a3a316;hb=9878a3da9568b100757b0313933441d2c7b1e7d2;hp=1cf7a47a9d93d4c660444a30c27d9ceed86e19c1;hpb=c4fb0b1d1fabecb314cc4d5db802ac9c6ffe3708;p=plcapi.git

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index 1cf7a47..a74db92 100644
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -1,10 +1,13 @@
 # $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Table import Row
 from PLC.Auth import Auth
-
+from PLC.Namespace import hostname_to_hrn
+from PLC.Peers import Peers
+from PLC.Sites import Sites
 from PLC.Nodes import Node, Nodes
 from PLC.TagTypes import TagTypes
 from PLC.NodeTags import NodeTags
@@ -12,13 +15,13 @@ from PLC.Methods.AddNodeTag import AddNodeTag
 from PLC.Methods.UpdateNodeTag import UpdateNodeTag
 
 admin_only = [ 'key', 'session', 'boot_nonce', 'site_id']
-can_update = ['hostname', 'boot_state', 'model', 'version'] + admin_only 
+can_update = ['hostname', 'node_type', 'boot_state', 'model', 'version'] + admin_only
 
 class UpdateNode(Method):
     """
     Updates a node. Only the fields specified in node_fields are
     updated, all other fields are left untouched.
-    
+
     PIs and techs can update only the nodes at their sites. Only
     admins can update the key, session, and boot_nonce fields.
 
@@ -42,8 +45,8 @@ class UpdateNode(Method):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, node_id_or_hostname, node_fields):
-        
-        # split provided fields 
+
+        # split provided fields
         [native,related,tags,rejected] = Row.split_fields(node_fields,[Node.fields,Node.related_fields,Node.tags])
 
         # type checking
@@ -54,8 +57,8 @@ class UpdateNode(Method):
         # Authenticated function
         assert self.caller is not None
 
-	# Remove admin only fields
-	if 'admin' not in self.caller['roles']:
+        # Remove admin only fields
+        if 'admin' not in self.caller['roles']:
             for key in admin_only:
                 if native.has_key(key):
                     del native[key]
@@ -79,10 +82,20 @@ class UpdateNode(Method):
         for (k,v) in related.iteritems():
             node.associate(auth, k,v)
 
-	node.update(native)
-	node.update_last_updated(commit=False)
+        node.update(native)
+        node.update_last_updated(commit=False)
         node.sync(commit=True)
-	
+
+        # if hostname was modifed make sure to update the hrn
+        # tag
+        if 'hostname' in native:
+            root_auth = self.api.config.PLC_HRN_ROOT
+            # sub auth is the login base of this node's site
+            sites = Sites(self.api, node['site_id'], ['login_base'])
+            site = sites[0]
+            login_base = site['login_base']
+            tags['hrn'] = hostname_to_hrn(root_auth, login_base, node['hostname'])
+
         for (tagname,value) in tags.iteritems():
             # the tagtype instance is assumed to exist, just check that
             if not TagTypes(self.api,{'tagname':tagname}):
@@ -93,14 +106,14 @@ class UpdateNode(Method):
             else:
                 UpdateNodeTag(self.api).__call__(auth,node_tags[0]['node_tag_id'],value)
 
-	# Logging variables
-	self.event_objects = {'Node': [node['node_id']]}
+        # Logging variables
+        self.event_objects = {'Node': [node['node_id']]}
         if 'hostname' in node:
             self.message = 'Node %s updated'%node['hostname']
         else:
             self.message = 'Node %d updated'%node['node_id']
         self.message += " [%s]." % (", ".join(node_fields.keys()),)
-	if 'boot_state' in node_fields.keys():
-		self.message += ' boot_state updated to %s' % node_fields['boot_state']
+        if 'boot_state' in node_fields.keys():
+            self.message += ' boot_state updated to %s' % node_fields['boot_state']
 
         return 1