(*) Peer has new fields person_ids and site_ids

[plcapi.git] / planetlab4.sql

diff --git a/planetlab4.sql b/planetlab4.sql
index c6642a6..39d30d8 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.49 2006/11/28 14:54:59 thierry Exp $
+-- $Id: planetlab4.sql,v 1.52 2006/11/29 17:57:27 tmack Exp $
 --
 
 --------------------------------------------------------------------------------
@@ -47,7 +47,7 @@ CREATE TABLE peers (
      peer_url text NOT NULL,      -- the url of that peer's API
      -- oops, looks like we have a dependency loop here
      --person_id integer REFERENCES persons NOT NULL, -- the account we use for logging in
-     person_id integer NOT NULL, -- the account we use for logging in
+     auth_person_id integer NOT NULL, -- the account we use for logging in
        
      deleted boolean NOT NULL DEFAULT false
 ) WITH OIDS;
@@ -299,7 +299,6 @@ CREATE TABLE nodes (
     model text, -- Hardware make and model
     boot_nonce text, -- Random nonce updated by Boot Manager
     version text, -- Boot CD version string updated by Boot Manager
-    -- XXX Should be key_id integer REFERENCES keys
     ssh_rsa_key text, -- SSH host key updated by Boot Manager
     key text, -- Node key generated by API when configuration file is downloaded
 
@@ -689,56 +688,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 ('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;
@@ -766,9 +724,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,
@@ -805,7 +762,19 @@ LEFT JOIN person_sites USING (person_id)
 LEFT JOIN person_keys USING (person_id)
 LEFT JOIN person_slices USING (person_id);
 
--- Nodes at each peer
+-- Objects at each peer
+CREATE VIEW peer_sites AS
+SELECT peer_id,
+array_accum(site_id) AS site_ids
+FROM sites
+GROUP BY peer_id;
+
+CREATE VIEW peer_persons AS
+SELECT peer_id,
+array_accum(person_id) AS person_ids
+FROM persons
+GROUP BY peer_id;
+
 CREATE VIEW peer_nodes AS
 SELECT peer_id,
 array_accum(node_id) AS node_ids
@@ -821,9 +790,13 @@ GROUP BY peer_id;
 CREATE VIEW view_peers AS
 SELECT 
 peers.*, 
+peer_sites.site_ids,
+peer_persons.person_ids,
 peer_nodes.node_ids,
 peer_slices.slice_ids
 FROM peers
+LEFT JOIN peer_sites USING (peer_id)
+LEFT JOIN peer_persons USING (peer_id)
 LEFT JOIN peer_nodes USING (peer_id)
 LEFT JOIN peer_slices USING (peer_id);