X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab4.sql;h=55f05f0f425d9e8f0ef86d4b6ea2d521a8a41612;hb=d1a8f97dc9e36fc576e0bf135c6a336384a2adcc;hp=0e28ec1838e8e564880322ed8fea078154a33564;hpb=7b4d4be1d1cb063dae5f46adf93f51b55db8da89;p=plcapi.git

diff --git a/planetlab4.sql b/planetlab4.sql
index 0e28ec1..55f05f0 100644
--- a/planetlab4.sql
+++ b/planetlab4.sql
@@ -9,7 +9,7 @@
 --
 -- Copyright (C) 2006 The Trustees of Princeton University
 --
--- $Id: planetlab4.sql,v 1.23 2006/10/25 14:13:14 mlhuang Exp $
+-- $Id: planetlab4.sql,v 1.61 2007/01/11 05:26:34 mlhuang Exp $
 --
 
 --------------------------------------------------------------------------------
@@ -25,6 +25,17 @@ CREATE AGGREGATE array_accum (
     initcond = '{}'
 );
 
+--------------------------------------------------------------------------------
+-- Version
+--------------------------------------------------------------------------------
+
+-- Database version
+CREATE TABLE plc_db_version (
+	version integer NOT NULL 
+) WITH OIDS;
+
+INSERT INTO plc_db_version (version) VALUES (4);
+
 --------------------------------------------------------------------------------
 -- Accounts
 --------------------------------------------------------------------------------
@@ -40,7 +51,7 @@ CREATE TABLE persons (
     enabled boolean NOT NULL DEFAULT false, -- Has been disabled
 
     -- Password
-    password text NOT NULL, -- Password (md5crypted)
+    password text NOT NULL DEFAULT 'nopass', -- Password (md5crypted)
     verification_key text, -- Reset password key
     verification_expires timestamp without time zone,
 
@@ -102,14 +113,14 @@ ORDER BY is_primary DESC;
 -- Sites that each person is a member of
 CREATE VIEW person_sites AS
 SELECT person_id,
-array_to_string(array_accum(site_id), ',') AS site_ids
+array_accum(site_id) AS site_ids
 FROM person_site_ordered
 GROUP BY person_id;
 
 -- Accounts at each site
 CREATE VIEW site_persons AS
 SELECT site_id,
-array_to_string(array_accum(person_id), ',') AS person_ids
+array_accum(person_id) AS person_ids
 FROM person_site
 GROUP BY site_id;
 
@@ -151,8 +162,8 @@ CREATE INDEX address_address_type_address_type_id_idx ON address_address_type (a
 
 CREATE VIEW address_address_types AS
 SELECT address_id,
-array_to_string(array_accum(address_type_id), ',') AS address_type_ids,
-array_to_string(array_accum(address_types.name), ',') AS address_types
+array_accum(address_type_id) AS address_type_ids,
+array_accum(address_types.name) AS address_types
 FROM address_address_type
 LEFT JOIN address_types USING (address_type_id)
 GROUP BY address_id;
@@ -167,7 +178,7 @@ CREATE INDEX site_address_address_id_idx ON site_address (address_id);
 
 CREATE VIEW site_addresses AS
 SELECT site_id,
-array_to_string(array_accum(address_id), ',') AS address_ids
+array_accum(address_id) AS address_ids
 FROM site_address
 GROUP BY site_id;
 
@@ -191,16 +202,14 @@ CREATE TABLE keys (
 
 -- Account authentication key(s)
 CREATE TABLE person_key (
-    person_id integer REFERENCES persons NOT NULL, -- Account identifier
-    key_id integer REFERENCES keys NOT NULL, -- Key identifier
-    PRIMARY KEY (person_id, key_id)
+    key_id integer REFERENCES keys PRIMARY KEY, -- Key identifier
+    person_id integer REFERENCES persons NOT NULL -- Account identifier
 ) WITH OIDS;
 CREATE INDEX person_key_person_id_idx ON person_key (person_id);
-CREATE INDEX person_key_key_id_idx ON person_key (key_id);
 
 CREATE VIEW person_keys AS
 SELECT person_id,
-array_to_string(array_accum(key_id), ',') AS key_ids
+array_accum(key_id) AS key_ids
 FROM person_key
 GROUP BY person_id;
 
@@ -217,8 +226,6 @@ INSERT INTO roles (role_id, name) VALUES (10, 'admin');
 INSERT INTO roles (role_id, name) VALUES (20, 'pi');
 INSERT INTO roles (role_id, name) VALUES (30, 'user');
 INSERT INTO roles (role_id, name) VALUES (40, 'tech');
-INSERT INTO roles (role_id, name) VALUES (1000, 'node');
-INSERT INTO roles (role_id, name) VALUES (2000, 'anonymous');
 
 CREATE TABLE person_role (
     person_id integer REFERENCES persons NOT NULL, -- Account identifier
@@ -230,8 +237,8 @@ CREATE INDEX person_role_person_id_idx ON person_role (person_id);
 -- Account roles
 CREATE VIEW person_roles AS
 SELECT person_id,
-array_to_string(array_accum(role_id), ',') AS role_ids,
-array_to_string(array_accum(roles.name), ',') AS roles
+array_accum(role_id) AS role_ids,
+array_accum(roles.name) AS roles
 FROM person_role
 LEFT JOIN roles USING (role_id)
 GROUP BY person_id;
@@ -256,7 +263,8 @@ CREATE TABLE nodes (
     -- Mandatory
     node_id serial PRIMARY KEY, -- Node identifier
     hostname text NOT NULL, -- Node hostname
-    site_id integer REFERENCES sites NOT NULL, -- At which site
+    site_id integer REFERENCES sites NOT NULL, -- At which site 
+
     boot_state text REFERENCES boot_states NOT NULL DEFAULT 'inst', -- Node boot state
     deleted boolean NOT NULL DEFAULT false, -- Is deleted
 
@@ -264,7 +272,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
 
@@ -278,7 +285,7 @@ CREATE INDEX nodes_site_id_idx ON nodes (site_id) WHERE deleted IS false;
 -- Nodes at each site
 CREATE VIEW site_nodes AS
 SELECT site_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
 FROM nodes
 GROUP BY site_id;
 
@@ -302,17 +309,17 @@ CREATE TABLE nodegroup_node (
 CREATE INDEX nodegroup_node_nodegroup_id_idx ON nodegroup_node (nodegroup_id);
 CREATE INDEX nodegroup_node_node_id_idx ON nodegroup_node (node_id);
 
--- Nodes in each node gruop
+-- Nodes in each node group
 CREATE VIEW nodegroup_nodes AS
 SELECT nodegroup_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
 FROM nodegroup_node
 GROUP BY nodegroup_id;
 
 -- Node groups that each node is a member of
 CREATE VIEW node_nodegroups AS
 SELECT node_id,
-array_to_string(array_accum(nodegroup_id), ',') AS nodegroup_ids
+array_accum(nodegroup_id) AS nodegroup_ids
 FROM nodegroup_node
 GROUP BY node_id;
 
@@ -346,14 +353,14 @@ CREATE INDEX conf_file_node_node_id_idx ON conf_file_node (node_id);
 -- Nodes linked to each configuration file
 CREATE VIEW conf_file_nodes AS
 SELECT conf_file_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
 FROM conf_file_node
 GROUP BY conf_file_id;
 
 -- Configuration files linked to each node
 CREATE VIEW node_conf_files AS
 SELECT node_id,
-array_to_string(array_accum(conf_file_id), ',') AS conf_file_ids
+array_accum(conf_file_id) AS conf_file_ids
 FROM conf_file_node
 GROUP BY node_id;
 
@@ -368,14 +375,14 @@ CREATE INDEX conf_file_nodegroup_nodegroup_id_idx ON conf_file_nodegroup (nodegr
 -- Node groups linked to each configuration file
 CREATE VIEW conf_file_nodegroups AS
 SELECT conf_file_id,
-array_to_string(array_accum(nodegroup_id), ',') AS nodegroup_ids
+array_accum(nodegroup_id) AS nodegroup_ids
 FROM conf_file_nodegroup
 GROUP BY conf_file_id;
 
 -- Configuration files linked to each node group
 CREATE VIEW nodegroup_conf_files AS
 SELECT nodegroup_id,
-array_to_string(array_accum(conf_file_id), ',') AS conf_file_ids
+array_accum(conf_file_id) AS conf_file_ids
 FROM conf_file_nodegroup
 GROUP BY nodegroup_id;
 
@@ -432,7 +439,7 @@ ORDER BY is_primary DESC;
 -- Network interfaces on each node
 CREATE VIEW node_nodenetworks AS
 SELECT node_id,
-array_to_string(array_accum(nodenetwork_id), ',') AS nodenetwork_ids
+array_accum(nodenetwork_id) AS nodenetwork_ids
 FROM nodenetworks_ordered
 GROUP BY node_id;
 
@@ -458,7 +465,7 @@ CREATE INDEX pcus_site_id_idx ON pcus (site_id);
 
 CREATE VIEW site_pcus AS
 SELECT site_id,
-array_to_string(array_accum(pcu_id), ',') AS pcu_ids
+array_accum(pcu_id) AS pcu_ids
 FROM pcus
 GROUP BY site_id;
 
@@ -474,15 +481,15 @@ CREATE INDEX pcu_node_node_id_idx ON pcu_node (node_id);
 
 CREATE VIEW node_pcus AS
 SELECT node_id,
-array_to_string(array_accum(pcu_id), ',') AS pcu_ids,
-array_to_string(array_accum(port), ',') AS ports
+array_accum(pcu_id) AS pcu_ids,
+array_accum(port) AS ports
 FROM pcu_node
 GROUP BY node_id;
 
 CREATE VIEW pcu_nodes AS
 SELECT pcu_id,
-array_to_string(array_accum(node_id), ',') AS node_ids,
-array_to_string(array_accum(port), ',') AS ports
+array_accum(node_id) AS node_ids,
+array_accum(port) AS ports
 FROM pcu_node
 GROUP BY pcu_id;
 
@@ -501,6 +508,7 @@ INSERT INTO slice_instantiations (instantiation) VALUES ('delegated'); -- Manual
 CREATE TABLE slices (
     slice_id serial PRIMARY KEY, -- Slice identifier
     site_id integer REFERENCES sites NOT NULL, -- Site identifier
+
     name text NOT NULL, -- Slice name
     instantiation text REFERENCES slice_instantiations NOT NULL DEFAULT 'plc-instantiated', -- Slice state, e.g. plc-instantiated
     url text, -- Project URL
@@ -533,22 +541,23 @@ SELECT * FROM slice_node;
 -- Nodes in each slice
 CREATE VIEW slice_nodes AS
 SELECT slice_id,
-array_to_string(array_accum(node_id), ',') AS node_ids
+array_accum(node_id) AS node_ids
 FROM slice_node
 GROUP BY slice_id;
 
 -- Slices on each node
 CREATE VIEW node_slices AS
 SELECT node_id,
-array_to_string(array_accum(slice_id), ',') AS slice_ids
+array_accum(slice_id) AS slice_ids
 FROM slice_node
 GROUP BY node_id;
 
 -- Slices at each site
 CREATE VIEW site_slices AS
 SELECT site_id,
-array_to_string(array_accum(slice_id), ',') AS slice_ids
+array_accum(slice_id) AS slice_ids
 FROM slices
+WHERE is_deleted is false
 GROUP BY site_id;
 
 -- Slice membership
@@ -563,14 +572,14 @@ CREATE INDEX slice_person_person_id_idx ON slice_person (person_id);
 -- Members of the slice
 CREATE VIEW slice_persons AS
 SELECT slice_id,
-array_to_string(array_accum(person_id), ',') AS person_ids
+array_accum(person_id) AS person_ids
 FROM slice_person
 GROUP BY slice_id;
 
 -- Slices of which each person is a member
 CREATE VIEW person_slices AS
 SELECT person_id,
-array_to_string(array_accum(slice_id), ',') AS slice_ids
+array_accum(slice_id) AS slice_ids
 FROM slice_person
 GROUP BY person_id;
 
@@ -599,10 +608,101 @@ CREATE INDEX slice_attribute_node_id_idx ON slice_attribute (node_id);
 
 CREATE VIEW slice_attributes AS
 SELECT slice_id,
-array_to_string(array_accum(slice_attribute_id), ',') AS slice_attribute_ids
+array_accum(slice_attribute_id) AS slice_attribute_ids
 FROM slice_attribute
 GROUP BY slice_id;
 
+--------------------------------------------------------------------------------
+-- Peers
+--------------------------------------------------------------------------------
+
+-- Peers
+CREATE TABLE peers (
+    peer_id serial PRIMARY KEY, -- Peer identifier
+    peername text NOT NULL, -- Peer name
+    peer_url text NOT NULL, -- (HTTPS) URL of the peer PLCAPI interface
+    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;
+CREATE INDEX peers_peername_idx ON peers (peername) WHERE deleted IS false;
+
+-- Objects at each peer
+CREATE TABLE peer_site (
+    site_id integer REFERENCES sites PRIMARY KEY, -- Local site identifier
+    peer_id integer REFERENCES peers NOT NULL, -- Peer identifier
+    peer_site_id integer NOT NULL, -- Foreign site identifier at peer
+    UNIQUE (peer_id, peer_site_id) -- The same foreign site should not be cached twice
+) WITH OIDS;
+CREATE INDEX peer_site_peer_id_idx ON peers (peer_id);
+
+CREATE VIEW peer_sites AS
+SELECT peer_id,
+array_accum(site_id) AS site_ids,
+array_accum(peer_site_id) AS peer_site_ids
+FROM peer_site
+GROUP BY peer_id;
+
+CREATE TABLE peer_person (
+    person_id integer REFERENCES persons PRIMARY KEY, -- Local user identifier
+    peer_id integer REFERENCES peers NOT NULL, -- Peer identifier
+    peer_person_id integer NOT NULL, -- Foreign user identifier at peer
+    UNIQUE (peer_id, peer_person_id) -- The same foreign user should not be cached twice
+) WITH OIDS;
+CREATE INDEX peer_person_peer_id_idx ON peer_person (peer_id);
+
+CREATE VIEW peer_persons AS
+SELECT peer_id,
+array_accum(person_id) AS person_ids,
+array_accum(peer_person_id) AS peer_person_ids
+FROM peer_person
+GROUP BY peer_id;
+
+CREATE TABLE peer_key (
+    key_id integer REFERENCES keys PRIMARY KEY, -- Local key identifier
+    peer_id integer REFERENCES peers NOT NULL, -- Peer identifier
+    peer_key_id integer NOT NULL, -- Foreign key identifier at peer
+    UNIQUE (peer_id, peer_key_id) -- The same foreign key should not be cached twice
+) WITH OIDS;
+CREATE INDEX peer_key_peer_id_idx ON peer_key (peer_id);
+
+CREATE VIEW peer_keys AS
+SELECT peer_id,
+array_accum(key_id) AS key_ids,
+array_accum(peer_key_id) AS peer_key_ids
+FROM peer_key
+GROUP BY peer_id;
+
+CREATE TABLE peer_node (
+    node_id integer REFERENCES nodes PRIMARY KEY, -- Local node identifier
+    peer_id integer REFERENCES peers NOT NULL, -- Peer identifier
+    peer_node_id integer NOT NULL, -- Foreign node identifier
+    UNIQUE (peer_id, peer_node_id) -- The same foreign node should not be cached twice
+) WITH OIDS;
+CREATE INDEX peer_node_peer_id_idx ON peer_node (peer_id);
+
+CREATE VIEW peer_nodes AS
+SELECT peer_id,
+array_accum(node_id) AS node_ids,
+array_accum(peer_node_id) AS peer_node_ids
+FROM peer_node
+GROUP BY peer_id;
+
+CREATE TABLE peer_slice (
+    slice_id integer REFERENCES slices PRIMARY KEY, -- Local slice identifier
+    peer_id integer REFERENCES peers NOT NULL, -- Peer identifier
+    peer_slice_id integer NOT NULL, -- Slice identifier at peer
+    UNIQUE (peer_id, peer_slice_id) -- The same foreign slice should not be cached twice
+) WITH OIDS;
+CREATE INDEX peer_slice_peer_id_idx ON peer_slice (peer_id);
+
+CREATE VIEW peer_slices AS
+SELECT peer_id,
+array_accum(slice_id) AS slice_ids,
+array_accum(peer_slice_id) AS peer_slice_ids
+FROM peer_slice
+GROUP BY peer_id;
+
 --------------------------------------------------------------------------------
 -- Authenticated sessions
 --------------------------------------------------------------------------------
@@ -631,61 +731,34 @@ CREATE TABLE node_session (
 ) WITH OIDS;
 
 --------------------------------------------------------------------------------
--- Events
+-- Message templates
 --------------------------------------------------------------------------------
 
--- 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 ('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 ('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 ('Unknown');
+CREATE TABLE messages (
+    message_id text PRIMARY KEY, -- Message name
+    subject text, -- Message summary
+    template text, -- Message template
+    enabled bool NOT NULL DEFAULT true -- Whether message is enabled
+) WITH OIDS;
+
+--------------------------------------------------------------------------------
+-- Events
+--------------------------------------------------------------------------------
 
 -- 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
-    runtime float, -- Event run time
-    time timestamp without time zone  NOT NULL DEFAULT CURRENT_TIMESTAMP -- Event timestamp
+    call_name text NOT NULL, -- Call responsible for this event
+    call text NOT NULL, -- Call responsible for this event, including parameters
+    message text, -- High level description of this event
+    runtime float DEFAULT 0, -- Event run time
+    time timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP -- Event timestamp
 ) WITH OIDS;
 
--- Event objects
+-- Database object(s) that may have been affected by a particular event
 CREATE TABLE event_object (
     event_id integer REFERENCES events NOT NULL, -- Event identifier
     object_id integer NOT NULL -- Object identifier
@@ -695,7 +768,7 @@ CREATE INDEX event_object_object_id_idx ON event_object (object_id);
 
 CREATE VIEW event_objects AS
 SELECT event_id,
-array_to_string(array_accum(object_id), ',') AS object_ids
+array_accum(object_id) AS object_ids
 FROM event_object
 GROUP BY event_id;
 
@@ -703,22 +776,21 @@ GROUP BY event_id;
 -- Useful views
 --------------------------------------------------------------------------------
 
---view_events
 CREATE VIEW view_events AS
 SELECT
 events.event_id,
 events.person_id,
-event_objects.object_ids,
-events.event_type,
-events.object_type,
+events.node_id,
 events.fault_code,
+events.call_name,
 events.call,
+events.message,
 events.runtime,
-events.time
-From events
+CAST(date_part('epoch', events.time) AS bigint) AS time,
+COALESCE(event_objects.object_ids, '{}') AS object_ids
+FROM events
 LEFT JOIN event_objects USING (event_id);
 
--- view_persons
 CREATE VIEW view_persons AS
 SELECT
 persons.person_id,
@@ -729,23 +801,47 @@ persons.deleted,
 persons.enabled,
 persons.password,
 persons.verification_key,
-persons.verification_expires,
+CAST(date_part('epoch', persons.verification_expires) AS bigint) AS verification_expires,
 persons.title,
 persons.phone,
 persons.url,
 persons.bio,
 CAST(date_part('epoch', persons.date_created) AS bigint) AS date_created,
 CAST(date_part('epoch', persons.last_updated) AS bigint) AS last_updated,
-person_roles.role_ids, person_roles.roles,
-person_sites.site_ids,
-person_keys.key_ids,
-person_slices.slice_ids
+peer_person.peer_id,
+peer_person.peer_person_id,
+COALESCE(person_roles.role_ids, '{}') AS role_ids,
+COALESCE(person_roles.roles, '{}') AS roles,
+COALESCE(person_sites.site_ids, '{}') AS site_ids,
+COALESCE(person_keys.key_ids, '{}') AS key_ids,
+COALESCE(person_slices.slice_ids, '{}') AS slice_ids
 FROM persons
+LEFT JOIN peer_person USING (person_id)
 LEFT JOIN person_roles USING (person_id)
 LEFT JOIN person_sites USING (person_id)
 LEFT JOIN person_keys USING (person_id)
 LEFT JOIN person_slices USING (person_id);
 
+CREATE VIEW view_peers AS
+SELECT 
+peers.*, 
+COALESCE(peer_sites.site_ids, '{}') AS site_ids,
+COALESCE(peer_sites.peer_site_ids, '{}') AS peer_site_ids,
+COALESCE(peer_persons.person_ids, '{}') AS person_ids,
+COALESCE(peer_persons.peer_person_ids, '{}') AS peer_person_ids,
+COALESCE(peer_keys.key_ids, '{}') AS key_ids,
+COALESCE(peer_keys.peer_key_ids, '{}') AS peer_key_ids,
+COALESCE(peer_nodes.node_ids, '{}') AS node_ids,
+COALESCE(peer_nodes.peer_node_ids, '{}') AS peer_node_ids,
+COALESCE(peer_slices.slice_ids, '{}') AS slice_ids,
+COALESCE(peer_slices.peer_slice_ids, '{}') AS peer_slice_ids
+FROM peers
+LEFT JOIN peer_sites USING (peer_id)
+LEFT JOIN peer_persons USING (peer_id)
+LEFT JOIN peer_keys USING (peer_id)
+LEFT JOIN peer_nodes USING (peer_id)
+LEFT JOIN peer_slices USING (peer_id);
+
 CREATE VIEW view_nodes AS
 SELECT
 nodes.node_id,
@@ -760,14 +856,17 @@ nodes.ssh_rsa_key,
 nodes.key,
 CAST(date_part('epoch', nodes.date_created) AS bigint) AS date_created,
 CAST(date_part('epoch', nodes.last_updated) AS bigint) AS last_updated,
-node_nodenetworks.nodenetwork_ids,
-node_nodegroups.nodegroup_ids,
-node_slices.slice_ids,
-node_pcus.pcu_ids,
-node_pcus.ports,
-node_conf_files.conf_file_ids,
+peer_node.peer_id,
+peer_node.peer_node_id,
+COALESCE(node_nodenetworks.nodenetwork_ids, '{}') AS nodenetwork_ids,
+COALESCE(node_nodegroups.nodegroup_ids, '{}') AS nodegroup_ids,
+COALESCE(node_slices.slice_ids, '{}') AS slice_ids,
+COALESCE(node_pcus.pcu_ids, '{}') AS pcu_ids,
+COALESCE(node_pcus.ports, '{}') AS ports,
+COALESCE(node_conf_files.conf_file_ids, '{}') AS conf_file_ids,
 node_session.session_id AS session
 FROM nodes
+LEFT JOIN peer_node USING (node_id)
 LEFT JOIN node_nodenetworks USING (node_id)
 LEFT JOIN node_nodegroups USING (node_id)
 LEFT JOIN node_slices USING (node_id)
@@ -777,48 +876,27 @@ LEFT JOIN node_session USING (node_id);
 
 CREATE VIEW view_nodegroups AS
 SELECT
-nodegroups.nodegroup_id,
-nodegroups.name,
-nodegroups.description,
-nodegroup_nodes.node_ids,
-nodegroup_conf_files.conf_file_ids
+nodegroups.*,
+COALESCE(nodegroup_nodes.node_ids, '{}') AS node_ids,
+COALESCE(nodegroup_conf_files.conf_file_ids, '{}') AS conf_file_ids
 FROM nodegroups
 LEFT JOIN nodegroup_nodes USING (nodegroup_id)
 LEFT JOIN nodegroup_conf_files USING (nodegroup_id);
 
 CREATE VIEW view_conf_files AS
 SELECT
-conf_files.conf_file_id,
-conf_files.enabled,
-conf_files.source,
-conf_files.dest,
-conf_files.file_permissions,
-conf_files.file_owner,
-conf_files.file_group,
-conf_files.preinstall_cmd,
-conf_files.postinstall_cmd,
-conf_files.error_cmd,
-conf_files.ignore_cmd_errors,
-conf_files.always_update,
-conf_file_nodes.node_ids,
-conf_file_nodegroups.nodegroup_ids
+conf_files.*,
+COALESCE(conf_file_nodes.node_ids, '{}') AS node_ids,
+COALESCE(conf_file_nodegroups.nodegroup_ids, '{}') AS nodegroup_ids
 FROM conf_files
 LEFT JOIN conf_file_nodes USING (conf_file_id)
 LEFT JOIN conf_file_nodegroups USING (conf_file_id);
 
 CREATE VIEW view_pcus AS
 SELECT
-pcus.pcu_id,
-pcus.site_id,
-pcus.hostname,
-pcus.ip,
-pcus.protocol,
-pcus.username,
-pcus.password,
-pcus.model,
-pcus.notes,
-pcu_nodes.node_ids,
-pcu_nodes.ports
+pcus.*,
+COALESCE(pcu_nodes.node_ids, '{}') AS node_ids,
+COALESCE(pcu_nodes.ports, '{}') AS ports
 FROM pcus
 LEFT JOIN pcu_nodes USING (pcu_id);
 
@@ -837,12 +915,15 @@ sites.longitude,
 sites.url,
 CAST(date_part('epoch', sites.date_created) AS bigint) AS date_created,
 CAST(date_part('epoch', sites.last_updated) AS bigint) AS last_updated,
-site_persons.person_ids,
-site_nodes.node_ids,
-site_addresses.address_ids,
-site_slices.slice_ids,
-site_pcus.pcu_ids
+peer_site.peer_id,
+peer_site.peer_site_id,
+COALESCE(site_persons.person_ids, '{}') AS person_ids,
+COALESCE(site_nodes.node_ids, '{}') AS node_ids,
+COALESCE(site_addresses.address_ids, '{}') AS address_ids,
+COALESCE(site_slices.slice_ids, '{}') AS slice_ids,
+COALESCE(site_pcus.pcu_ids, '{}') AS pcu_ids
 FROM sites
+LEFT JOIN peer_site USING (site_id)
 LEFT JOIN site_persons USING (site_id)
 LEFT JOIN site_nodes USING (site_id)
 LEFT JOIN site_addresses USING (site_id)
@@ -851,19 +932,22 @@ LEFT JOIN site_pcus USING (site_id);
 
 CREATE VIEW view_addresses AS
 SELECT
-addresses.address_id,
-addresses.line1,
-addresses.line2,
-addresses.line3,
-addresses.city,
-addresses.state,
-addresses.postalcode,
-addresses.country,
-address_address_types.address_type_ids,
-address_address_types.address_types
+addresses.*,
+COALESCE(address_address_types.address_type_ids, '{}') AS address_type_ids,
+COALESCE(address_address_types.address_types, '{}') AS address_types
 FROM addresses
 LEFT JOIN address_address_types USING (address_id);
 
+CREATE VIEW view_keys AS
+SELECT
+keys.*,
+person_key.person_id,
+peer_key.peer_id,
+peer_key.peer_key_id
+FROM keys
+LEFT JOIN person_key USING (key_id)
+LEFT JOIN peer_key USING (key_id);
+
 CREATE VIEW view_slices AS
 SELECT
 slices.slice_id,
@@ -877,10 +961,13 @@ slices.creator_person_id,
 slices.is_deleted,
 CAST(date_part('epoch', slices.created) AS bigint) AS created,
 CAST(date_part('epoch', slices.expires) AS bigint) AS expires,
-slice_nodes.node_ids,
-slice_persons.person_ids,
-slice_attributes.slice_attribute_ids
+peer_slice.peer_id,
+peer_slice.peer_slice_id,
+COALESCE(slice_nodes.node_ids, '{}') AS node_ids,
+COALESCE(slice_persons.person_ids, '{}') AS person_ids,
+COALESCE(slice_attributes.slice_attribute_ids, '{}') AS slice_attribute_ids
 FROM slices
+LEFT JOIN peer_slice USING (slice_id)
 LEFT JOIN slice_nodes USING (slice_id)
 LEFT JOIN slice_persons USING (slice_id)
 LEFT JOIN slice_attributes USING (slice_id);