X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateSite.py;h=86ae121ad9cde49dd1d5a0452916550b4c03ee99;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=03b1e13b37f9fc76d358edf5c0de9f3fe5fbc4e3;hpb=e848398878d06cdc99f374052388fce4629645c5;p=plcapi.git

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index 03b1e13..86ae121 100644
--- a/PLC/Methods/UpdateSite.py
+++ b/PLC/Methods/UpdateSite.py
@@ -4,17 +4,24 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
 
+from PLC.TagTypes import TagTypes
+from PLC.SiteTags import SiteTags
+from PLC.Methods.AddSiteTag import AddSiteTag
+from PLC.Methods.UpdateSiteTag import UpdateSiteTag
+
+related_fields = Site.related_fields.keys()
 can_update = lambda (field, value): field in \
              ['name', 'abbreviated_name', 'login_base',
               'is_public', 'latitude', 'longitude', 'url',
-              'max_slices', 'max_slivers', 'enabled', 'ext_consortium_id']
+              'max_slices', 'max_slivers', 'enabled', 'ext_consortium_id'] + \
+              related_fields
 
 class UpdateSite(Method):
     """
     Updates a site. Only the fields specified in update_fields are
     updated, all other fields are left untouched.
 
-    PIs can only update sites they are a member of. Only admins can 
+    PIs can only update sites they are a member of. Only admins can
     update max_slices, max_slivers, and login_base.
 
     Returns 1 if successful, faults otherwise.
@@ -22,7 +29,7 @@ class UpdateSite(Method):
 
     roles = ['admin', 'pi']
 
-    site_fields = dict(filter(can_update, Site.fields.items()))
+    site_fields = dict(filter(can_update, Site.fields.items() + Site.related_fields.items()))
 
     accepts = [
         Auth(),
@@ -59,13 +66,34 @@ class UpdateSite(Method):
                 if key in site_fields:
                     del site_fields[key]
 
+        # Make requested associations
+        for field in related_fields:
+            if field in site_fields:
+                site.associate(auth, field, site_fields[field])
+                site_fields.pop(field)
+
         site.update(site_fields)
-	site.update_last_updated(False)
-	site.sync()
-	
-	# Logging variables
-	self.event_objects = {'Site': [site['site_id']]}
-	self.message = 'Site %d updated: %s' % \
-		(site['site_id'], ", ".join(site_fields.keys()))  	
-	
-	return 1
+        site.update_last_updated(False)
+        site.sync()
+
+        # Logging variables
+        self.event_objects = {'Site': [site['site_id']]}
+        self.message = 'Site %d updated: %s' % \
+                (site['site_id'], ", ".join(site_fields.keys()))
+
+        # Update Site HRN if login_base changed
+        if 'login_base' in site_fields:
+            root_auth = self.api.config.PLC_HRN_ROOT
+            tagname = 'hrn'
+            tagvalue = '.'.join([root_auth, site['login_base']])
+            # check if the tagtype instance exists
+            tag_types = TagTypes(self.api,{'tagname':tagname})
+            if tag_types:
+                site_tags=SiteTags(self.api,{'tagname':tagname,'site_id':site['site_id']})
+                if not site_tags:
+                    AddSiteTag(self.api).__call__(auth,int(site['site_id']),tagname,tagvalue)
+                else:
+                    UpdateSiteTag(self.api).__call__(auth,site_tags[0]['site_tag_id'],tagvalue)
+
+
+        return 1