From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 2 Jun 2012 11:06:52 +0000 (+0200)
Subject: cleaup up sfi.Update a bit
X-Git-Tag: sfa-2.1-8~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cc9fc0ffc23982bf163b2405cbc14412428b48a0;p=sfa.git

cleaup up sfi.Update a bit
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index b114c303..4387dbaa 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -866,13 +866,14 @@ or version information about sfi itself
             self.print_help()
             sys.exit(1)
 
-        record = Record(dict=record_dict)        
-        if record.type == "user":
-            if record.hrn == self.user:
+        # don't translate into an object, as this would possibly distort
+        # user-provided data; e.g. add an 'email' field to Users
+        if record_dict['type'] == "user":
+            if record_dict['hrn'] == self.user:
                 cred = self.my_credential_string
             else:
                 cred = self.my_authority_credential_string()
-        elif record.type in ["slice"]:
+        elif record_dict['type'] in ["slice"]:
             try:
                 cred = self.slice_credential_string(record.hrn)
             except ServerException, e:
@@ -882,13 +883,12 @@ or version information about sfi itself
                    cred = self.my_authority_credential_string()
                else:
                    raise
-        elif record.type in ["authority"]:
+        elif record_dict['type'] in ["authority"]:
             cred = self.my_authority_credential_string()
-        elif record.type == 'node':
+        elif record_dict['type'] == 'node':
             cred = self.my_authority_credential_string()
         else:
-            raise "unknown record type" + record.type
-        record_dict = record.todict()
+            raise "unknown record type" + record_dict['type']
         return self.registry().Update(record_dict, cred)
   
     def remove(self, options, args):