- removed anything having to with event_type/event_object

diff --git a/PLC/Events.py b/PLC/Events.py
index b8131c8..774aae9 100644 (file)
--- a/PLC/Events.py
+++ b/PLC/Events.py
@@ -4,7 +4,7 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Events.py,v 1.6 2006/11/09 03:07:42 mlhuang Exp $
+# $Id: Events.py,v 1.7 2006/11/09 19:43:55 mlhuang Exp $
 #
 
 from PLC.Faults import *
@@ -24,10 +24,9 @@ class Event(Row):
         'event_id': Parameter(int, "Event identifier"),
         'person_id': Parameter(int, "Identifier of person responsible for event, if any"),
         'node_id': Parameter(int, "Identifier of node responsible for event, if any"),
-        'event_type': Parameter(str, "Type of event"),
-        'object_type': Parameter(str, "Type of object affected by this event"),
         'fault_code': Parameter(int, "Event fault code"),
-        'call': Parameter(str, "Call responsible for this event"),
+       'call_name': Parameter(str, "Call responsible for this event"),
+       'call': Parameter(str, "Call responsible for this event, including paramters"),
         'runtime': Parameter(float, "Runtime of event"),
         'time': Parameter(int, "Date and time that the event took place, in seconds since UNIX epoch", ro = True),
         'object_ids': Parameter([int], "IDs of objects affected by this event")

diff --git a/PLC/Method.py b/PLC/Method.py
index 344b95c..2b062d1 100644 (file)
--- a/PLC/Method.py
+++ b/PLC/Method.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Method.py,v 1.17 2006/11/03 23:44:51 mlhuang Exp $
+# $Id: Method.py,v 1.18 2006/11/08 22:11:26 mlhuang Exp $
 #
 
 import xmlrpclib
@@ -129,6 +129,7 @@ class Method:
         # Log call representation
         # XXX Truncate to avoid DoS
         event['call'] = self.name + pprint.saferepr(args)
+       event['call_name'] = self.name
 
         # Both users and nodes can call some methods
         if isinstance(self.caller, Person):

diff --git a/planetlab4.sql b/planetlab4.sql
index 0b6122d..bf3f156 100644 (file)
--- a/planetlab4.sql
+++ b/planetlab4.sql
@@ -9,7 +9,7 @@
 --
 -- Copyright (C) 2006 The Trustees of Princeton University
 --
--- $Id: planetlab4.sql,v 1.50 2006/11/28 21:48:08 tmack Exp $
+-- $Id: planetlab4.sql,v 1.51 2006/11/28 22:00:14 tmack Exp $
 --
 
 --------------------------------------------------------------------------------
@@ -689,57 +689,15 @@ CREATE TABLE messages (
 -- Events
 --------------------------------------------------------------------------------
 
--- Event types
-CREATE TABLE event_types (
-    event_type text PRIMARY KEY -- Event type
-) WITH OIDS;
-INSERT INTO event_types (event_type) VALUES ('Add');
-INSERT INTO event_types (event_type) VALUES ('AddTo');
-INSERT INTO event_types (event_type) VALUES ('Get');
-INSERT INTO event_types (event_type) VALUES ('Update');
-INSERT INTO event_types (event_type) VALUES ('Delete');
-INSERT INTO event_types (event_type) VALUES ('DeleteFrom');
-INSERT INTO event_types (event_type) VALUES ('Unknown');
-
--- Object types
-CREATE TABLE object_types (
-    object_type text PRIMARY KEY -- Object type 
-) WITH OIDS;
-INSERT INTO object_types (object_type) VALUES ('AddressType');
-INSERT INTO object_types (object_type) VALUES ('Address');
-INSERT INTO object_types (object_type) VALUES ('BootState');
-INSERT INTO object_types (object_type) VALUES ('ConfFile');
-INSERT INTO object_types (object_type) VALUES ('KeyType');
-INSERT INTO object_types (object_type) VALUES ('Key');
-INSERT INTO object_types (object_type) VALUES ('Message');
-INSERT INTO object_types (object_type) VALUES ('NetworkMethod');
-INSERT INTO object_types (object_type) VALUES ('NetworkType');
-INSERT INTO object_types (object_type) VALUES ('Network');
-INSERT INTO object_types (object_type) VALUES ('NodeGroup');
-INSERT INTO object_types (object_type) VALUES ('NodeNetwork');
-INSERT INTO object_types (object_type) VALUES ('Node');
-INSERT INTO object_types (object_type) VALUES ('PCU');
-INSERT INTO object_types (object_type) VALUES ('Peer');
-INSERT INTO object_types (object_type) VALUES ('Person');
-INSERT INTO object_types (object_type) VALUES ('Role');
-INSERT INTO object_types (object_type) VALUES ('Session');
-INSERT INTO object_types (object_type) VALUES ('Site');
-INSERT INTO object_types (object_type) VALUES ('SliceAttributeType');
-INSERT INTO object_types (object_type) VALUES ('SliceAttribute');
-INSERT INTO object_types (object_type) VALUES ('Slice');
-INSERT INTO object_types (object_type) VALUES ('SliceInstantiation');
-INSERT INTO object_types (object_type) VALUES ('Sliver');
-INSERT INTO object_types (object_type) VALUES ('Unknown');
 
 -- Events
 CREATE TABLE events (
     event_id serial PRIMARY KEY,  -- Event identifier
     person_id integer REFERENCES persons, -- Person responsible for event, if any
     node_id integer REFERENCES nodes, -- Node responsible for event, if any
-    event_type text REFERENCES event_types NOT NULL DEFAULT 'Unknown', -- Event type 
-    object_type text REFERENCES object_types NOT NULL DEFAULT 'Unknown', -- Object type associated with event
     fault_code integer NOT NULL DEFAULT 0, -- Did this event result in error
-    call text NOT NULL, -- Call responsible for this event
+    call_name text Not NULL, -- Call responsible for this event
+    call text NOT NULL, -- Call responsible for this event, including paramters
     runtime float, -- Event run time
     time timestamp without time zone  NOT NULL DEFAULT CURRENT_TIMESTAMP -- Event timestamp
 ) WITH OIDS;
@@ -767,9 +725,8 @@ SELECT
 events.event_id,
 events.person_id,
 events.node_id,
-events.event_type,
-events.object_type,
 events.fault_code,
+events.call_name,
 events.call,
 events.runtime,
 CAST(date_part('epoch', events.time) AS bigint) AS time,