svn keywords

[plcapi.git] / PLC / Methods / DeleteAddress.py

diff --git a/PLC/Methods/DeleteAddress.py b/PLC/Methods/DeleteAddress.py
index 363896f..0b0924d 100644 (file)
--- a/PLC/Methods/DeleteAddress.py
+++ b/PLC/Methods/DeleteAddress.py
@@ -1,8 +1,10 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Addresses import Address, Addresses
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class DeleteAddress(Method):
     """
@@ -16,15 +18,16 @@ class DeleteAddress(Method):
     roles = ['admin', 'pi']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Address.fields['address_id'],
         ]
 
     returns = Parameter(int, '1 if successful')
+    
 
     def call(self, auth, address_id):
         # Get associated address details
-        addresses = Addresses(self.api, [address_id]).values()
+        addresses = Addresses(self.api, [address_id])
         if not addresses:
             raise PLCInvalidArgument, "No such address"
         address = addresses[0]
@@ -35,4 +38,8 @@ class DeleteAddress(Method):
 
         address.delete()
 
+       # Logging variables
+        self.event_objects = {'Address': [address['address_id']]}
+       self.message = 'Address %d deleted' % address['address_id']     
+
         return 1