X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab4.sql;h=a879d243e651ef2636716f792bd1eb37b3748f31;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=39d30d89d4d45ddbe836b1e53a33ecc5cb4b7884;hpb=dfd614ed44d424d6677599d55dc8ccf76f274a2b;p=plcapi.git diff --git a/planetlab4.sql b/planetlab4.sql index 39d30d8..a879d24 100644 --- a/planetlab4.sql +++ b/planetlab4.sql @@ -9,9 +9,11 @@ -- -- Copyright (C) 2006 The Trustees of Princeton University -- --- $Id: planetlab4.sql,v 1.52 2006/11/29 17:57:27 tmack Exp $ +-- $Id: planetlab4.sql 6903 2007-11-12 22:45:01Z tmack $ -- +SET client_encoding = 'UNICODE'; + -------------------------------------------------------------------------------- -- Aggregates and store procedures -------------------------------------------------------------------------------- @@ -29,28 +31,13 @@ CREATE AGGREGATE array_accum ( -- Version -------------------------------------------------------------------------------- ---version +-- Database version CREATE TABLE plc_db_version ( - version integer NOT NULL + version integer NOT NULL, + subversion integer NOT NULL DEFAULT 0 ) WITH OIDS; -INSERT INTO plc_db_version (version) VALUES (4); - --------------------------------------------------------------------------------- --- Peers --------------------------------------------------------------------------------- - --- Peers -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 - auth_person_id integer NOT NULL, -- the account we use for logging in - - deleted boolean NOT NULL DEFAULT false -) WITH OIDS; +INSERT INTO plc_db_version (version, subversion) VALUES (4, 9); -------------------------------------------------------------------------------- -- Accounts @@ -67,7 +54,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, @@ -79,9 +66,7 @@ CREATE TABLE persons ( -- Timestamps date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, - last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, - - peer_id integer REFERENCES peers -- From which peer + last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP ) WITH OIDS; CREATE INDEX persons_email_idx ON persons (email) WHERE deleted IS false; @@ -96,6 +81,7 @@ CREATE TABLE sites ( login_base text NOT NULL, -- Site slice prefix name text NOT NULL, -- Site name abbreviated_name text NOT NULL, -- Site abbreviated name + enabled boolean NOT NULL Default true, -- Is this site enabled deleted boolean NOT NULL DEFAULT false, -- Has been deleted is_public boolean NOT NULL DEFAULT true, -- Shows up in public lists max_slices integer NOT NULL DEFAULT 0, -- Maximum number of slices @@ -105,12 +91,11 @@ CREATE TABLE sites ( latitude real, longitude real, url text, + ext_consortium_id integer, -- external consortium id -- Timestamps date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, - last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, - - peer_id integer REFERENCES peers -- From which peer + last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP ) WITH OIDS; CREATE INDEX sites_login_base_idx ON sites (login_base) WHERE deleted IS false; @@ -217,18 +202,15 @@ CREATE TABLE keys ( key_id serial PRIMARY KEY, -- Key identifier key_type text REFERENCES key_types NOT NULL, -- Key type key text NOT NULL, -- Key material - is_blacklisted boolean NOT NULL DEFAULT false, -- Has been blacklisted - peer_id integer REFERENCES peers -- From which peer + is_blacklisted boolean NOT NULL DEFAULT false -- Has been blacklisted ) WITH OIDS; -- 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, @@ -249,10 +231,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'); --- xxx not sure this us useful yet ---INSERT INTO roles (role_id, name) VALUES (3000, 'peer'); CREATE TABLE person_role ( person_id integer REFERENCES persons NOT NULL, -- Account identifier @@ -305,8 +283,7 @@ CREATE TABLE nodes ( -- Timestamps date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, - - peer_id integer REFERENCES peers -- From which peer + last_contact timestamp without time zone ) WITH OIDS; CREATE INDEX nodes_hostname_idx ON nodes (hostname) WHERE deleted IS false; CREATE INDEX nodes_site_id_idx ON nodes (site_id) WHERE deleted IS false; @@ -316,6 +293,7 @@ CREATE VIEW site_nodes AS SELECT site_id, array_accum(node_id) AS node_ids FROM nodes +WHERE deleted IS false GROUP BY site_id; -------------------------------------------------------------------------------- @@ -472,6 +450,67 @@ array_accum(nodenetwork_id) AS nodenetwork_ids FROM nodenetworks_ordered GROUP BY node_id; +-------------------------------------------------------------------------------- +-- Nodenetwork setting types and nodenetworks settings +-------------------------------------------------------------------------------- + +CREATE TABLE nodenetwork_setting_types ( + nodenetwork_setting_type_id serial PRIMARY KEY, + -- Setting Type Identifier + name text UNIQUE NOT NULL, -- Setting Name + description text, -- Optional Description + category text NOT NULL, -- Category, e.g. Wifi, or whatever + min_role_id integer references roles -- If set, minimal role required +) WITH OIDS; + +CREATE TABLE nodenetwork_setting ( + nodenetwork_setting_id serial PRIMARY KEY, -- Nodenetwork Setting Identifier + nodenetwork_id integer REFERENCES nodenetworks NOT NULL, + -- the nodenetwork this applies to + nodenetwork_setting_type_id integer REFERENCES nodenetwork_setting_types NOT NULL, + -- the setting type + value text +) WITH OIDS; + +CREATE OR REPLACE VIEW nodenetwork_settings AS +SELECT nodenetwork_id, +array_accum(nodenetwork_setting_id) AS nodenetwork_setting_ids +FROM nodenetwork_setting +GROUP BY nodenetwork_id; + +CREATE OR REPLACE VIEW view_nodenetwork_settings AS +SELECT +nodenetwork_setting.nodenetwork_setting_id, +nodenetwork_setting.nodenetwork_id, +nodenetwork_setting_types.nodenetwork_setting_type_id, +nodenetwork_setting_types.name, +nodenetwork_setting_types.description, +nodenetwork_setting_types.category, +nodenetwork_setting_types.min_role_id, +nodenetwork_setting.value +FROM nodenetwork_setting +INNER JOIN nodenetwork_setting_types USING (nodenetwork_setting_type_id); + +CREATE OR REPLACE VIEW view_nodenetworks AS +SELECT +nodenetworks.nodenetwork_id, +nodenetworks.node_id, +nodenetworks.is_primary, +nodenetworks.type, +nodenetworks.method, +nodenetworks.ip, +nodenetworks.mac, +nodenetworks.gateway, +nodenetworks.network, +nodenetworks.broadcast, +nodenetworks.netmask, +nodenetworks.dns1, +nodenetworks.dns2, +nodenetworks.bwlimit, +nodenetworks.hostname, +COALESCE((SELECT nodenetwork_setting_ids FROM nodenetwork_settings WHERE nodenetwork_settings.nodenetwork_id = nodenetworks.nodenetwork_id), '{}') AS nodenetwork_setting_ids +FROM nodenetworks; + -------------------------------------------------------------------------------- -- Power control units (PCUs) -------------------------------------------------------------------------------- @@ -532,12 +571,12 @@ CREATE TABLE slice_instantiations ( INSERT INTO slice_instantiations (instantiation) VALUES ('not-instantiated'); -- Placeholder slice INSERT INTO slice_instantiations (instantiation) VALUES ('plc-instantiated'); -- Instantiated by Node Manager INSERT INTO slice_instantiations (instantiation) VALUES ('delegated'); -- Manually instantiated +INSERT INTO slice_instantiations (instantiation) VALUES ('nm-controller'); -- NM Controller -- Slices CREATE TABLE slices ( slice_id serial PRIMARY KEY, -- Slice identifier site_id integer REFERENCES sites NOT NULL, -- Site identifier - peer_id integer REFERENCES peers, -- on which peer name text NOT NULL, -- Slice name instantiation text REFERENCES slice_instantiations NOT NULL DEFAULT 'plc-instantiated', -- Slice state, e.g. plc-instantiated @@ -546,7 +585,7 @@ CREATE TABLE slices ( max_nodes integer NOT NULL DEFAULT 100, -- Maximum number of nodes that can be assigned to this slice - creator_person_id integer REFERENCES persons NOT NULL, -- Creator + creator_person_id integer REFERENCES persons, -- Creator created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, -- Creation date expires timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP + '2 weeks', -- Expiration date @@ -613,6 +652,25 @@ array_accum(slice_id) AS slice_ids FROM slice_person GROUP BY person_id; +-------------------------------------------------------------------------------- +-- Slice whitelist +-------------------------------------------------------------------------------- +-- slice whitelist on nodes +CREATE TABLE node_slice_whitelist ( + node_id integer REFERENCES nodes NOT NULL, -- Node id of whitelist + slice_id integer REFERENCES slices NOT NULL, -- Slice id thats allowd on this node + PRIMARY KEY (node_id, slice_id) +) WITH OIDS; +CREATE INDEX node_slice_whitelist_node_id_idx ON node_slice_whitelist (node_id); +CREATE INDEX node_slice_whitelist_slice_id_idx ON node_slice_whitelist (slice_id); + +-- Slices on each node +CREATE VIEW node_slices_whitelist AS +SELECT node_id, +array_accum(slice_id) AS slice_ids_whitelist +FROM node_slice_whitelist +GROUP BY node_id; + -------------------------------------------------------------------------------- -- Slice attributes -------------------------------------------------------------------------------- @@ -622,9 +680,7 @@ CREATE TABLE slice_attribute_types ( attribute_type_id serial PRIMARY KEY, -- Attribute type identifier name text UNIQUE NOT NULL, -- Attribute name description text, -- Attribute description - min_role_id integer REFERENCES roles DEFAULT 10, -- If set, minimum (least powerful) role that can set or change this attribute - - peer_id integer REFERENCES peers -- From which peer + min_role_id integer REFERENCES roles DEFAULT 10 -- If set, minimum (least powerful) role that can set or change this attribute ) WITH OIDS; -- Slice/sliver attributes @@ -632,13 +688,13 @@ CREATE TABLE slice_attribute ( slice_attribute_id serial PRIMARY KEY, -- Slice attribute identifier slice_id integer REFERENCES slices NOT NULL, -- Slice identifier node_id integer REFERENCES nodes, -- Sliver attribute if set + nodegroup_id integer REFERENCES nodegroups, -- Node group attribute if set attribute_type_id integer REFERENCES slice_attribute_types NOT NULL, -- Attribute type identifier - value text, - - peer_id integer REFERENCES peers -- From which peer + value text ) WITH OIDS; CREATE INDEX slice_attribute_slice_id_idx ON slice_attribute (slice_id); CREATE INDEX slice_attribute_node_id_idx ON slice_attribute (node_id); +CREATE INDEX slice_attribute_nodegroup_id_idx ON slice_attribute (nodegroup_id); CREATE VIEW slice_attributes AS SELECT slice_id, @@ -646,6 +702,112 @@ array_accum(slice_attribute_id) AS slice_attribute_ids FROM slice_attribute GROUP BY slice_id; +-------------------------------------------------------------------------------- +-- Initscripts +-------------------------------------------------------------------------------- + +-- Initscripts +CREATE TABLE initscripts ( + initscript_id serial PRIMARY KEY, -- Initscript identifier + name text NOT NULL, -- Initscript name + enabled bool NOT NULL DEFAULT true, -- Initscript is active + script text NOT NULL, -- Initscript + UNIQUE (name) +) WITH OIDS; +CREATE INDEX initscripts_name_idx ON initscripts (name); + + +-------------------------------------------------------------------------------- +-- 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 -------------------------------------------------------------------------------- @@ -673,6 +835,34 @@ CREATE TABLE node_session ( UNIQUE (session_id) -- Sessions are unique ) WITH OIDS; + + +------------------------------------------------------------------------------- +-- PCU Types +------------------------------------------------------------------------------ +CREATE TABLE pcu_types ( + pcu_type_id serial PRIMARY KEY, + model text NOT NULL , -- PCU model name + name text -- Full PCU model name +) WITH OIDS; +CREATE INDEX pcu_types_model_idx ON pcu_types (model); + +CREATE TABLE pcu_protocol_type ( + pcu_protocol_type_id serial PRIMARY KEY, + pcu_type_id integer REFERENCES pcu_types NOT NULL, -- PCU type identifier + port integer NOT NULL, -- PCU port + protocol text NOT NULL, -- Protocol + supported boolean NOT NULL DEFAULT True -- Does PLC support +) WITH OIDS; +CREATE INDEX pcu_protocol_type_pcu_type_id ON pcu_protocol_type (pcu_type_id); + + +CREATE OR REPLACE VIEW pcu_protocol_types AS +SELECT pcu_type_id, +array_accum(pcu_protocol_type_id) as pcu_protocol_type_ids +FROM pcu_protocol_type +GROUP BY pcu_type_id; + -------------------------------------------------------------------------------- -- Message templates -------------------------------------------------------------------------------- @@ -688,38 +878,65 @@ CREATE TABLE messages ( -- 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 + auth_type text, -- Type of auth used. i.e. AuthMethod fault_code integer NOT NULL DEFAULT 0, -- Did this event result in error - 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 + 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 + object_id integer NOT NULL, -- Object identifier + object_type text NOT NULL Default 'Unknown' -- What type of object is this event affecting ) WITH OIDS; CREATE INDEX event_object_event_id_idx ON event_object (event_id); CREATE INDEX event_object_object_id_idx ON event_object (object_id); +CREATE INDEX event_object_object_type_idx ON event_object (object_type); -CREATE VIEW event_objects AS +CREATE OR REPLACE VIEW event_objects AS SELECT event_id, -array_accum(object_id) AS object_ids +array_accum(object_id) AS object_ids, +array_accum(object_type) AS object_types FROM event_object GROUP BY event_id; -------------------------------------------------------------------------------- -- Useful views -------------------------------------------------------------------------------- +CREATE OR REPLACE VIEW view_pcu_types AS +SELECT +pcu_types.pcu_type_id, +pcu_types.model, +pcu_types.name, +COALESCE((SELECT pcu_protocol_type_ids FROM pcu_protocol_types WHERE pcu_protocol_types.pcu_type_id = pcu_types.pcu_type_id), '{}') AS pcu_protocol_type_ids +FROM pcu_types; + +CREATE OR REPLACE VIEW view_events AS +SELECT +events.event_id, +events.person_id, +events.node_id, +events.auth_type, +events.fault_code, +events.call_name, +events.call, +events.message, +events.runtime, +CAST(date_part('epoch', events.time) AS bigint) AS time, +COALESCE((SELECT object_ids FROM event_objects WHERE event_objects.event_id = events.event_id), '{}') AS object_ids, +COALESCE((SELECT object_types FROM event_objects WHERE event_objects.event_id = events.event_id), '{}') AS object_types +FROM events; -CREATE VIEW view_events AS +CREATE OR REPLACE VIEW view_event_objects AS SELECT events.event_id, events.person_id, @@ -727,13 +944,14 @@ events.node_id, events.fault_code, events.call_name, events.call, +events.message, events.runtime, 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); +event_object.object_id, +event_object.object_type +FROM events LEFT JOIN event_object USING (event_id); -CREATE VIEW view_persons AS +CREATE OR REPLACE VIEW view_persons AS SELECT persons.person_id, persons.email, @@ -743,69 +961,43 @@ 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, -persons.peer_id, CAST(date_part('epoch', persons.date_created) AS bigint) AS date_created, CAST(date_part('epoch', persons.last_updated) AS bigint) AS last_updated, -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 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); - --- 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 +peer_person.peer_id, +peer_person.peer_person_id, +COALESCE((SELECT role_ids FROM person_roles WHERE person_roles.person_id = persons.person_id), '{}') AS role_ids, +COALESCE((SELECT roles FROM person_roles WHERE person_roles.person_id = persons.person_id), '{}') AS roles, +COALESCE((SELECT site_ids FROM person_sites WHERE person_sites.person_id = persons.person_id), '{}') AS site_ids, +COALESCE((SELECT key_ids FROM person_keys WHERE person_keys.person_id = persons.person_id), '{}') AS key_ids, +COALESCE((SELECT slice_ids FROM person_slices WHERE person_slices.person_id = persons.person_id), '{}') AS slice_ids FROM persons -GROUP BY peer_id; +LEFT JOIN peer_person USING (person_id); -CREATE VIEW peer_nodes AS -SELECT peer_id, -array_accum(node_id) AS node_ids -FROM nodes -GROUP BY peer_id; - -CREATE VIEW peer_slices AS -SELECT peer_id, -array_accum(slice_id) AS slice_ids -FROM slices -GROUP BY peer_id; - -CREATE VIEW view_peers AS +CREATE OR REPLACE 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); - -CREATE VIEW view_nodes AS +COALESCE((SELECT site_ids FROM peer_sites WHERE peer_sites.peer_id = peers.peer_id), '{}') AS site_ids, +COALESCE((SELECT peer_site_ids FROM peer_sites WHERE peer_sites.peer_id = peers.peer_id), '{}') AS peer_site_ids, +COALESCE((SELECT person_ids FROM peer_persons WHERE peer_persons.peer_id = peers.peer_id), '{}') AS person_ids, +COALESCE((SELECT peer_person_ids FROM peer_persons WHERE peer_persons.peer_id = peers.peer_id), '{}') AS peer_person_ids, +COALESCE((SELECT key_ids FROM peer_keys WHERE peer_keys.peer_id = peers.peer_id), '{}') AS key_ids, +COALESCE((SELECT peer_key_ids FROM peer_keys WHERE peer_keys.peer_id = peers.peer_id), '{}') AS peer_key_ids, +COALESCE((SELECT node_ids FROM peer_nodes WHERE peer_nodes.peer_id = peers.peer_id), '{}') AS node_ids, +COALESCE((SELECT peer_node_ids FROM peer_nodes WHERE peer_nodes.peer_id = peers.peer_id), '{}') AS peer_node_ids, +COALESCE((SELECT slice_ids FROM peer_slices WHERE peer_slices.peer_id = peers.peer_id), '{}') AS slice_ids, +COALESCE((SELECT peer_slice_ids FROM peer_slices WHERE peer_slices.peer_id = peers.peer_id), '{}') AS peer_slice_ids +FROM peers; + +CREATE OR REPLACE VIEW view_nodes AS SELECT nodes.node_id, nodes.hostname, nodes.site_id, -nodes.peer_id, nodes.boot_state, nodes.deleted, nodes.model, @@ -815,116 +1007,90 @@ 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, -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, +CAST(date_part('epoch', nodes.last_contact) AS bigint) AS last_contact, +peer_node.peer_id, +peer_node.peer_node_id, +COALESCE((SELECT nodenetwork_ids FROM node_nodenetworks WHERE node_nodenetworks.node_id = nodes.node_id), '{}') AS nodenetwork_ids, +COALESCE((SELECT nodegroup_ids FROM node_nodegroups WHERE node_nodegroups.node_id = nodes.node_id), '{}') AS nodegroup_ids, +COALESCE((SELECT slice_ids FROM node_slices WHERE node_slices.node_id = nodes.node_id), '{}') AS slice_ids, +COALESCE((SELECT slice_ids_whitelist FROM node_slices_whitelist WHERE node_slices_whitelist.node_id = nodes.node_id), '{}') AS slice_ids_whitelist, +COALESCE((SELECT pcu_ids FROM node_pcus WHERE node_pcus.node_id = nodes.node_id), '{}') AS pcu_ids, +COALESCE((SELECT ports FROM node_pcus WHERE node_pcus.node_id = nodes.node_id), '{}') AS ports, +COALESCE((SELECT conf_file_ids FROM node_conf_files WHERE node_conf_files.node_id = nodes.node_id), '{}') AS conf_file_ids, node_session.session_id AS session FROM nodes -LEFT JOIN node_nodenetworks USING (node_id) -LEFT JOIN node_nodegroups USING (node_id) -LEFT JOIN node_slices USING (node_id) -LEFT JOIN node_pcus USING (node_id) -LEFT JOIN node_conf_files USING (node_id) +LEFT JOIN peer_node USING (node_id) LEFT JOIN node_session USING (node_id); -CREATE VIEW view_nodegroups AS +CREATE OR REPLACE VIEW view_nodegroups AS SELECT -nodegroups.nodegroup_id, -nodegroups.name, -nodegroups.description, -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 +nodegroups.*, +COALESCE((SELECT node_ids FROM nodegroup_nodes WHERE nodegroup_nodes.nodegroup_id = nodegroups.nodegroup_id), '{}') AS node_ids, +COALESCE((SELECT conf_file_ids FROM nodegroup_conf_files WHERE nodegroup_conf_files.nodegroup_id = nodegroups.nodegroup_id), '{}') AS conf_file_ids +FROM nodegroups; + +CREATE OR REPLACE 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, -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 +conf_files.*, +COALESCE((SELECT node_ids FROM conf_file_nodes WHERE conf_file_nodes.conf_file_id = conf_files.conf_file_id), '{}') AS node_ids, +COALESCE((SELECT nodegroup_ids FROM conf_file_nodegroups WHERE conf_file_nodegroups.conf_file_id = conf_files.conf_file_id), '{}') AS nodegroup_ids +FROM conf_files; + +CREATE OR REPLACE 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, -COALESCE(pcu_nodes.node_ids, '{}') AS node_ids, -COALESCE(pcu_nodes.ports, '{}') AS ports -FROM pcus -LEFT JOIN pcu_nodes USING (pcu_id); +pcus.*, +COALESCE((SELECT node_ids FROM pcu_nodes WHERE pcu_nodes.pcu_id = pcus.pcu_id), '{}') AS node_ids, +COALESCE((SELECT ports FROM pcu_nodes WHERE pcu_nodes.pcu_id = pcus.pcu_id), '{}') AS ports +FROM pcus; -CREATE VIEW view_sites AS +CREATE OR REPLACE VIEW view_sites AS SELECT sites.site_id, sites.login_base, sites.name, sites.abbreviated_name, sites.deleted, +sites.enabled, sites.is_public, sites.max_slices, sites.max_slivers, sites.latitude, sites.longitude, sites.url, -sites.peer_id, +sites.ext_consortium_id, CAST(date_part('epoch', sites.date_created) AS bigint) AS date_created, CAST(date_part('epoch', sites.last_updated) AS bigint) AS last_updated, -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 +peer_site.peer_id, +peer_site.peer_site_id, +COALESCE((SELECT person_ids FROM site_persons WHERE site_persons.site_id = sites.site_id), '{}') AS person_ids, +COALESCE((SELECT node_ids FROM site_nodes WHERE site_nodes.site_id = sites.site_id), '{}') AS node_ids, +COALESCE((SELECT address_ids FROM site_addresses WHERE site_addresses.site_id = sites.site_id), '{}') AS address_ids, +COALESCE((SELECT slice_ids FROM site_slices WHERE site_slices.site_id = sites.site_id), '{}') AS slice_ids, +COALESCE((SELECT pcu_ids FROM site_pcus WHERE site_pcus.site_id = sites.site_id), '{}') AS pcu_ids FROM sites -LEFT JOIN site_persons USING (site_id) -LEFT JOIN site_nodes USING (site_id) -LEFT JOIN site_addresses USING (site_id) -LEFT JOIN site_slices USING (site_id) -LEFT JOIN site_pcus USING (site_id); +LEFT JOIN peer_site USING (site_id); + +CREATE OR REPLACE VIEW view_addresses AS +SELECT +addresses.*, +COALESCE((SELECT address_type_ids FROM address_address_types WHERE address_address_types.address_id = addresses.address_id), '{}') AS address_type_ids, +COALESCE((SELECT address_types FROM address_address_types WHERE address_address_types.address_id = addresses.address_id), '{}') AS address_types +FROM addresses; -CREATE VIEW view_addresses AS +CREATE OR REPLACE VIEW view_keys AS SELECT -addresses.address_id, -addresses.line1, -addresses.line2, -addresses.line3, -addresses.city, -addresses.state, -addresses.postalcode, -addresses.country, -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_slices AS +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 OR REPLACE VIEW view_slices AS SELECT slices.slice_id, slices.site_id, -slices.peer_id, slices.name, slices.instantiation, slices.url, @@ -934,30 +1100,29 @@ 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, -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 +peer_slice.peer_id, +peer_slice.peer_slice_id, +COALESCE((SELECT node_ids FROM slice_nodes WHERE slice_nodes.slice_id = slices.slice_id), '{}') AS node_ids, +COALESCE((SELECT person_ids FROM slice_persons WHERE slice_persons.slice_id = slices.slice_id), '{}') AS person_ids, +COALESCE((SELECT slice_attribute_ids FROM slice_attributes WHERE slice_attributes.slice_id = slices.slice_id), '{}') AS slice_attribute_ids FROM slices -LEFT JOIN slice_nodes USING (slice_id) -LEFT JOIN slice_persons USING (slice_id) -LEFT JOIN slice_attributes USING (slice_id); +LEFT JOIN peer_slice USING (slice_id); --- -CREATE VIEW view_slice_attributes AS +CREATE OR REPLACE VIEW view_slice_attributes AS SELECT slice_attribute.slice_attribute_id, slice_attribute.slice_id, slice_attribute.node_id, +slice_attribute.nodegroup_id, slice_attribute_types.attribute_type_id, slice_attribute_types.name, slice_attribute_types.description, slice_attribute_types.min_role_id, -slice_attribute.value, -slice_attribute.peer_id +slice_attribute.value FROM slice_attribute INNER JOIN slice_attribute_types USING (attribute_type_id); -CREATE VIEW view_sessions AS +CREATE OR REPLACE VIEW view_sessions AS SELECT sessions.session_id, CAST(date_part('epoch', sessions.expires) AS bigint) AS expires, @@ -985,6 +1150,3 @@ INSERT INTO sites (login_base, name, abbreviated_name, max_slices) VALUES ('pl', 'PlanetLab Central', 'PLC', 100); - - -