- peers: replace persons authentication with GPG/SSL authentication

[plcapi.git] / planetlab4.sql

diff --git a/planetlab4.sql b/planetlab4.sql
index bf3f156..cd83b5e 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.51 2006/11/28 22:00:14 tmack Exp $
+-- $Id: planetlab4.sql,v 1.53 2006/12/12 10:58:58 thierry Exp $
 --
 
 --------------------------------------------------------------------------------
@@ -45,10 +45,9 @@ CREATE TABLE peers (
      peer_id  serial PRIMARY KEY, -- identifier
      peername text NOT NULL,      -- free text
      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
-       
+     cacert text, -- (SSL) Public certificate of peer API server
+     key text, -- (GPG) Public key used for authentication
+
      deleted boolean NOT NULL DEFAULT false
 ) WITH OIDS;
 
@@ -299,7 +298,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
 
@@ -763,7 +761,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
@@ -779,9 +789,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);