- updated valid_event_types

- no longer title() values in event/object_type_list types when validating (stricter)

diff --git a/PLC/Methods/GetEvents.py b/PLC/Methods/GetEvents.py
index 05be881..05a011a 100644 (file)
--- a/PLC/Methods/GetEvents.py
+++ b/PLC/Methods/GetEvents.py
@@ -41,17 +41,18 @@ class GetEvents(Method):
 
        # filter out invalid event types
        if event_type_list:
-               event_type_list = [event_type.title() for event_type in event_type_list]
-               valid_event_types = ['Add', 'Get', 'Update', 'Delete', 'Unknown']
+               valid_event_types = ['Add', 'AddTo', 'Get', 'Update', 'Delete', \
+                                    'DeleteFrom', 'Unknown']
                if filter(lambda field: field not in valid_event_types, event_type_list):
                        raise PLCInvalidArgument, "Invalid event type. Must be in %s" % \
                                                  valid_event_types
        
        # filter out invalid object types
        if object_type_list:
-               object_type_list = [object_type.title() for object_type in object_type_list]
-               valid_object_types = ['Person', 'Site', 'Node', 'Slice', 'Address', \
-                                     'Attribute', 'Key', 'Nodegroup', 'Unknown']
+               valid_object_types = ['AddreessType', 'Address', 'BootState', 'ConfFile', \
+                                     'KeyType', 'Key', 'NetworkType', 'NodeGroup',\
+                                     'NodeNetwork', 'Node', 'PCU', 'Perons', 'Site', \
+                                     'SliceAttributeType', 'SliceAttribute', 'Slice', 'Unknown']
                if filter(lambda field: field not in valid_object_types, object_type_list):
                        raise PLCInvalidArgument, "Invalid object type. Must be in %s" % \
                                                  valid_object_types
@@ -63,10 +64,9 @@ class GetEvents(Method):
                elif len(object_type_list) > 1:
                        raise PLCInvalidArgument, "Cannot specify multiple object types when object_ids are specified"
        
-       
         # Get node information
         events = Events(self.api, event_id_list, person_id_list, event_type_list, \
-                       object_type_list, object_id_list).values()
+                       object_type_list, object_id_list, fault_code_list).values()
 
         # turn each node into a real dict.
         events = [dict(event) for event in events]