X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteKey.py;h=51c40d417ae6acad3cbb666e15f66516b047dfb8;hb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;hp=aef608422a883210306525e91a03a7bc51935cd9;hpb=1f8c38dd1357c93e4be8d94456b7274a591d2db4;p=plcapi.git

diff --git a/PLC/Methods/DeleteKey.py b/PLC/Methods/DeleteKey.py
index aef6084..51c40d4 100644
--- a/PLC/Methods/DeleteKey.py
+++ b/PLC/Methods/DeleteKey.py
@@ -22,17 +22,25 @@ class DeleteKey(Method):
 
     returns = Parameter(int, '1 if successful')
 
+
     def call(self, auth, key_id):
         # Get associated key details
-        keys = Keys(self.api, [key_id]).values()
+        keys = Keys(self.api, [key_id])
         if not keys:
             raise PLCInvalidArgument, "No such key"
         key = keys[0]
 
+        if key['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local key"
+
         if 'admin' not in self.caller['roles']:
             if key['key_id'] not in self.caller['key_ids']:
                 raise PLCPermissionDenied, "Key must be associated with your account"
 
         key.delete()
 
+        # Logging variables
+        self.event_objects = {'Key': [key['key_id']]}
+        self.message = 'Key %d deleted' % key['key_id']
+
         return 1