removed another bunch of references to geni

[sfa.git] / sfa / methods / update.py

diff --git a/sfa/methods/update.py b/sfa/methods/update.py
index 23b74c8..2a1be73 100644 (file)
--- a/sfa/methods/update.py
+++ b/sfa/methods/update.py
@@ -5,18 +5,13 @@ import time
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed

-from sfa.trust.auth import Auth
-from sfa.util.record import GeniRecord
-from sfa.util.genitable import GeniTable
-from sfa.trust.certificate import Keypair, convert_public_key
-from sfa.trust.gid import *

 from sfa.util.debug import log
 from sfa.trust.credential import Credential
 
 class update(Method):
     """
     Update an object in the registry. Currently, this only updates the
 from sfa.util.debug import log
 from sfa.trust.credential import Credential
 
 class update(Method):
     """
     Update an object in the registry. Currently, this only updates the

-    PLC information associated with the record. The Geni fields (name, type,
+    PLC information associated with the record. The SFA fields (name, type,

     GID) are fixed.
     
     @param cred credential string specifying rights of the caller
     GID) are fixed.
     
     @param cred credential string specifying rights of the caller


@@ -31,7 +26,7 @@ class update(Method):
         Parameter(str, "Credential string"),
         Parameter(dict, "Record dictionary to be updated"),
         Mixed(Parameter(str, "Human readable name of the original caller"),
         Parameter(str, "Credential string"),
         Parameter(dict, "Record dictionary to be updated"),
         Mixed(Parameter(str, "Human readable name of the original caller"),

-              Paramater(None, "Origin hrn not specified"))
+              Parameter(None, "Origin hrn not specified"))

         ]
 
     returns = Parameter(int, "1 if successful")
         ]
 
     returns = Parameter(int, "1 if successful")


@@ -47,87 +42,10 @@ class update(Method):
         # validate the cred
         self.api.auth.check(cred, "update")
         
         # validate the cred
         self.api.auth.check(cred, "update")
         

-        new_record = GeniRecord(dict = record_dict)
-        type = new_record['type']
-        hrn = new_record['hrn']
-        self.api.auth.verify_object_permission(hrn)
-        table = GeniTable()
-        # make sure the record exists
-        records = table.findObjects({'type': type, 'hrn': hrn})
-        if not records:
-            raise RecordNotFound(hrn)
-        record = records[0]
-        record['last_updated'] = time.gmtime()
-         
-        # Update_membership needs the membership lists in the existing record
-        # filled in, so it can see if members were added or removed
-        self.api.fill_record_info(record)
+        # send the call to the right manager
+        manager_base = 'sfa.managers'
+        mgr_type = self.api.config.SFA_REGISTRY_TYPE
+        manager_module = manager_base + ".registry_manager_%s" % mgr_type
+        manager = __import__(manager_module, fromlist=[manager_base])
+        return manager.update(self.api, record_dict)

 
 

-         # Use the pointer from the existing record, not the one that the user
-        # gave us. This prevents the user from inserting a forged pointer
-        pointer = record['pointer']
-
-        # update the PLC information that was specified with the record
-
-        if (type == "authority"):
-            self.api.plshell.UpdateSite(self.api.plauth, pointer, new_record)
-
-        elif type == "slice":
-            pl_record=self.api.geni_fields_to_pl_fields(type, hrn, new_record)
-            if 'name' in pl_record:
-                pl_record.pop('name')
-            self.api.plshell.UpdateSlice(self.api.plauth, pointer, pl_record)
-
-        elif type == "user":
-            # SMBAKER: UpdatePerson only allows a limited set of fields to be
-            #    updated. Ideally we should have a more generic way of doing
-            #    this. I copied the field names from UpdatePerson.py...
-            update_fields = {}
-            all_fields = new_record
-            for key in all_fields.keys():
-                if key in ['first_name', 'last_name', 'title', 'email',
-                           'password', 'phone', 'url', 'bio', 'accepted_aup',
-                           'enabled']:
-                    update_fields[key] = all_fields[key]
-            self.api.plshell.UpdatePerson(self.api.plauth, pointer, update_fields)
-
-            if 'key' in new_record and new_record['key']:
-                # must check this key against the previous one if it exists
-                persons = self.api.plshell.GetPersons(self.api.plauth, [pointer], ['key_ids'])
-                person = persons[0]
-                keys = person['key_ids']
-                keys = self.api.plshell.GetKeys(self.api.plauth, person['key_ids'])
-                key_exists = False
-                if isinstance(new_record['key'], list):
-                    new_key = new_record['key'][0]
-                else:
-                    new_key = new_record['key']
-  
-                # Delete all stale keys
-                for key in keys:
-                    if new_record['key'] != key['key']:
-                        self.api.plshell.DeleteKey(self.api.plauth, key['key_id'])
-                    else:
-                        key_exists = True
-                if not key_exists:
-                    self.api.plshell.AddPersonKey(self.api.plauth, pointer, {'key_type': 'ssh', 'key': new_key})
-
-                # update the openssl key and gid
-                pkey = convert_public_key(new_key)
-                uuid = create_uuid()
-                gid_object = self.api.auth.hierarchy.create_gid(hrn, uuid, pkey)
-                gid = gid_object.save_to_string(save_parents=True)
-                record['gid'] = gid
-                record = GeniRecord(dict=record)
-                table.update(record)
-                 
-        elif type == "node":
-            self.api.plshell.UpdateNode(self.api.plauth, pointer, new_record)
-
-        else:
-            raise UnknownGeniType(type)
-
-        # update membership for researchers, pis, owners, operators
-        self.api.update_membership(record, new_record)
-
-        return 1