Merge from HEAD. Signed off by tmack.

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

diff --git a/PLC/Methods/UpdateSliceAttributeType.py b/PLC/Methods/UpdateSliceAttributeType.py
index e863b48..145a51d 100644 (file)
--- a/PLC/Methods/UpdateSliceAttributeType.py
+++ b/PLC/Methods/UpdateSliceAttributeType.py
@@ -2,7 +2,7 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.SliceAttributeTypes import SliceAttributeType, SliceAttributeTypes
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 can_update = lambda (field, value): field in \
              ['name', 'description', 'min_role_id']
@@ -17,13 +17,13 @@ class UpdateSliceAttributeType(Method):
 
     roles = ['admin']
 
-    update_fields = dict(filter(can_update, SliceAttributeType.fields.items()))
+    attribute_type_fields = dict(filter(can_update, SliceAttributeType.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(SliceAttributeType.fields['attribute_type_id'],
               SliceAttributeType.fields['name']),
-        update_fields
+        attribute_type_fields
         ]
 
     returns = Parameter(int, '1 if successful')
@@ -31,13 +31,13 @@ class UpdateSliceAttributeType(Method):
     def call(self, auth, attribute_type_id_or_name, attribute_type_fields):
         attribute_type_fields = dict(filter(can_update, attribute_type_fields.items()))
 
-        attribute_types = SliceAttributeTypes(self.api, [attribute_type_id_or_name]).values()
+        attribute_types = SliceAttributeTypes(self.api, [attribute_type_id_or_name])
         if not attribute_types:
             raise PLCInvalidArgument, "No such attribute"
         attribute_type = attribute_types[0]
 
         attribute_type.update(attribute_type_fields)
-
         attribute_type.sync()
+       self.event_objects = {'AttributeType': [attribute_type['attribute_type_id']]}
 
         return 1