the build was failing here due to IndentationError

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

diff --git a/sfa/methods/remove.py b/sfa/methods/remove.py
index b56cc50..8925002 100644 (file)
--- a/sfa/methods/remove.py
+++ b/sfa/methods/remove.py
@@ -28,19 +28,25 @@ 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, caller_cred=None):
+    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")
-       if caller_cred==None:
-          caller_cred=cred
-       
-       #log the call
-       self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
         self.api.auth.verify_object_permission(hrn)
+        
         table = GeniTable()
         filter = {'hrn': hrn}
         if type not in ['all', '*']:
@@ -51,14 +57,16 @@ class remove(Method):
         record = records[0]
         type = record['type']
 
-       credential = self.api.getCredential()
+        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_remote_object(credential, hrn, record)
+
+        # 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":
             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 
@@ -79,6 +87,4 @@ class remove(Method):
 
         table.remove(record)
            
-       # forward the call after replacing the root hrn
-
         return 1