get the correct remote address

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

diff --git a/sfa/methods/remove_peer_object.py b/sfa/methods/remove_peer_object.py
index 625450d..51fb658 100644 (file)
--- a/sfa/methods/remove_peer_object.py
+++ b/sfa/methods/remove_peer_object.py
@@ -26,17 +26,19 @@ class remove_peer_object(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(dict, "Record dictionary")
+        Parameter(dict, "Record dictionary"),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, record, caller_cred=None):
+    def call(self, cred, record, request_hash=None, caller_cred=None):
         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(), record['hrn'], self.name))
-        
+        self.api.auth.authenticateCred(cred, [cred], request_hash) 
         self.api.auth.check(cred, "remove")
 
         # Only allow the local interface or record owner to delete peer_records 
@@ -47,6 +49,7 @@ class remove_peer_object(Method):
         hrn, type = record['hrn'], record['type']
         records = table.find({'hrn': hrn, 'type': type })
         for record in records:
+         if record['peer_authority']:
             self.remove_plc_record(record)
             table.remove(record)