X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fremove.py;h=89250027778e8d842e418ff8aee6858e8d64224e;hb=1412a985ce2454db4b79127a4d0979f284dc2459;hp=59cc0af9da077ac0e3e9fa6ecd68a6d24c83b3a3;hpb=f13173726f8382eef380f1e754f24dd2b126a77b;p=sfa.git

diff --git a/sfa/methods/remove.py b/sfa/methods/remove.py
index 59cc0af9..89250027 100644
--- a/sfa/methods/remove.py
+++ b/sfa/methods/remove.py
@@ -4,9 +4,12 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
+from sfa.util.genitable import GeniTable
 from sfa.util.debug import log
+from sfa.trust.credential import Credential
+from sfa.server.registry import Registries
 
 class remove(Method):
     """
@@ -25,43 +28,63 @@ class remove(Method):
     accepts = [
         Parameter(str, "Credential string"),
         Parameter(str, "Record type"),
-        Parameter(str, "Human readable name (hrn) of record to be removed")
+        Parameter(str, "Human readable name of slice to instantiate"),
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, type, hrn):
+    def call(self, cred, type, hrn, origin_hrn=None):
+        user_cred = Credential(string=cred)
+
+        #log the call
+        if not origin_hrn:
+            origin_hrn = user_cred.get_gid_caller().get_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
+
+        # validate the cred
         self.api.auth.check(cred, "remove")
         self.api.auth.verify_object_permission(hrn)
-        auth_name = self.api.auth.get_authority(hrn)
-        table = self.api.auth.get_auth_table(auth_name)
-        record_list = table.resolve(type, hrn)
-        if not record_list:
-            raise RecordNotFound(hrn)
-        record = record_list[0]
         
+        table = GeniTable()
+        filter = {'hrn': hrn}
+        if type not in ['all', '*']:
+            filter['type'] = type
+        records = table.find(filter)
+        if not records:
+            raise RecordNotFound(hrn)
+        record = records[0]
         type = record['type']
-        # TODO: sa, ma
+
+        credential = self.api.getCredential()
+       	registries = Registries(self.api) 
+
+        # Try to remove the object from the PLCDB of federated agg.
+        # This is attempted before removing the object from the local agg's PLCDB and sfa table
+        if hrn.startswith(self.api.hrn) and type in ['user', 'slice', 'authority']:
+            for registry in registries:
+                if registry not in [self.api.hrn]:
+                    result=registries[registry].remove_peer_object(credential, record, origin_hrn)
+                    pass
         if type == "user":
-            self.api.plshell.DeletePerson(self.api.plauth, record.get_pointer())
+            persons = self.api.plshell.GetPersons(self.api.plauth, record['pointer'])
+            # only delete this person if he has site ids. if he doesnt, it probably means 
+            # he was just removed from a site, not actually deleted
+            if persons and persons[0]['site_ids']:
+                self.api.plshell.DeletePerson(self.api.plauth, record['pointer'])
         elif type == "slice":
-            self.api.plshell.DeleteSlice(self.api.plauth, record.get_pointer())
+            if self.api.plshell.GetSlices(self.api.plauth, record['pointer']):
+                self.api.plshell.DeleteSlice(self.api.plauth, record['pointer'])
         elif type == "node":
-            self.api.plshell.DeleteNode(self.api.plauth, record.get_pointer())
-        elif (type in ['authority', 'sa', 'ma']):
-            other_rec = table.resolve(type, record.get_name())
-                
-            if other_rec:
-                # sa and ma both map to a site, so if we are deleting one
-                # but the other still exists, then do not delete the site
-                print >> log, "not removing site", record.get_name(), "because either sa or ma still exists"
-                pass
-            else:
-                print >> log, "removing site", record.get_name()
-                self.api.plshell.DeleteSite(self.api.plauth, record.get_pointer())
+            if self.api.plshell.GetNodes(self.api.plauth, record['pointer']):
+                self.api.plshell.DeleteNode(self.api.plauth, record['pointer'])
+        elif type == "authority":
+            if self.api.plshell.GetSites(self.api.plauth, record['pointer']):
+                self.api.plshell.DeleteSite(self.api.plauth, record['pointer'])
         else:
             raise UnknownGeniType(type)
 
         table.remove(record)
-
+           
         return 1