Merge branch 'upstreammaster'

[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 b079ff0..a510189 100644 (file)
--- a/sfa/methods/remove_peer_object.py
+++ b/sfa/methods/remove_peer_object.py
@@ -1,16 +1,12 @@
-from sfa.util.faults import *
+from sfa.util.faults import UnknownSfaType, SfaInvalidArgument
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.util.record import SfaRecord
 from sfa.util.table import SfaTable
-from sfa.util.debug import log
 from sfa.trust.credential import Credential
-from types import StringTypes
 
 class remove_peer_object(Method):
     """
-    Remove an peer object from the PLC records of a local aggregate. 
+    Remove a peer object from the PLC records of a local aggregate. 
     This method will be called by registry.remove() while removing 
     a record from the local aggreage's PLCDB and sfa table. This 
     method need not be directly called by end-user.
@@ -38,7 +34,7 @@ class remove_peer_object(Method):
         #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))
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, record['hrn'], self.name))
 
         self.api.auth.check(cred, "remove")