X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab4.sql;h=1ae1461cd1b0a2e83d01c59b4e268284d1ddc44b;hb=7e87a2ec0638e9116253ff73b207b6f4f6cd8c60;hp=1dae7582be6916819c9fd1fcc3b87e8bc385f9f3;hpb=9f3cc4c19a293b6435605171268d49d0d1d4c32a;p=plcapi.git diff --git a/planetlab4.sql b/planetlab4.sql index 1dae758..1ae1461 100644 --- a/planetlab4.sql +++ b/planetlab4.sql @@ -9,7 +9,7 @@ -- -- Copyright (C) 2006 The Trustees of Princeton University -- --- $Id: planetlab4.sql,v 1.12 2006/10/16 21:57:17 mlhuang Exp $ +-- $Id: planetlab4.sql,v 1.35 2006/11/15 10:59:54 thierry Exp $ -- -------------------------------------------------------------------------------- @@ -25,6 +25,17 @@ CREATE AGGREGATE array_accum ( initcond = '{}' ); +-------------------------------------------------------------------------------- +-- Version +-------------------------------------------------------------------------------- + +--version +CREATE TABLE plc_db_version ( + version integer NOT NULL +) WITH OIDS; + +INSERT INTO plc_db_version (version) VALUES (4); + -------------------------------------------------------------------------------- -- Accounts -------------------------------------------------------------------------------- @@ -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; @@ -121,7 +132,8 @@ CREATE TABLE address_types ( address_type_id serial PRIMARY KEY, -- Address type identifier name text UNIQUE NOT NULL, -- Address type description text -- Address type description -); +) WITH OIDS; + INSERT INTO address_types (name) VALUES ('Personal'); INSERT INTO address_types (name) VALUES ('Shipping'); -- XXX Used to be Site @@ -130,7 +142,6 @@ INSERT INTO address_types (name) VALUES ('Billing'); -- Mailing addresses CREATE TABLE addresses ( address_id serial PRIMARY KEY, -- Address identifier - site_id integer REFERENCES sites NOT NULL, -- Site identifier line1 text NOT NULL, -- Address line 1 line2 text, -- Address line 2 line3 text, -- Address line 3 @@ -143,21 +154,32 @@ CREATE TABLE addresses ( -- Each mailing address can be one of several types CREATE TABLE address_address_type ( address_id integer REFERENCES addresses NOT NULL, -- Address identifier - address_type_id integer REFERENCES address_types NOT NULL -- Address type + address_type_id integer REFERENCES address_types NOT NULL, -- Address type + PRIMARY KEY (address_id, address_type_id) ) WITH OIDS; +CREATE INDEX address_address_type_address_id_idx ON address_address_type (address_id); +CREATE INDEX address_address_type_address_type_id_idx ON address_address_type (address_type_id); 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; +CREATE TABLE site_address ( + site_id integer REFERENCES sites NOT NULL, -- Site identifier + address_id integer REFERENCES addresses NOT NULL, -- Address identifier + PRIMARY KEY (site_id, address_id) +) WITH OIDS; +CREATE INDEX site_address_site_id_idx ON site_address (site_id); +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 -FROM addresses +array_accum(address_id) AS address_ids +FROM site_address GROUP BY site_id; -------------------------------------------------------------------------------- @@ -189,7 +211,7 @@ 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; @@ -208,6 +230,8 @@ 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 @@ -219,8 +243,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; @@ -240,12 +264,23 @@ INSERT INTO boot_states (boot_state) VALUES ('rins'); INSERT INTO boot_states (boot_state) VALUES ('rcnf'); INSERT INTO boot_states (boot_state) VALUES ('new'); +-- 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 + person_id integer REFERENCES persons NOT NULL, -- the account we use for logging in + + deleted boolean NOT NULL DEFAULT false +) WITH OIDS; + + -- Nodes 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, -- At which site (clause NOT NULL removed for foreign_nodes) boot_state text REFERENCES boot_states NOT NULL DEFAULT 'inst', -- Node boot state deleted boolean NOT NULL DEFAULT false, -- Is deleted @@ -256,7 +291,6 @@ CREATE TABLE nodes ( -- 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 - session text, -- Session key generated by PLC when Boot Manager authenticates -- Timestamps date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -268,10 +302,26 @@ 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; +-- Nodes - peers relationship +CREATE TABLE peer_node ( + peer_id integer REFERENCES peers NOT NULL, -- Peer identifier + node_id integer REFERENCES nodes NOT NULL, -- (Local) node identifier + PRIMARY KEY (peer_id, node_id), + UNIQUE (node_id) -- Nodes can only be at one peer +) WITH OIDS; +CREATE INDEX peer_node_peer_id_idx ON peer_node (peer_id); + +-- Nodes at each peer +CREATE VIEW peer_nodes AS +SELECT peer_id, +array_accum(node_id) AS node_ids +FROM peer_node +GROUP BY peer_id; + -------------------------------------------------------------------------------- -- Node groups -------------------------------------------------------------------------------- @@ -292,20 +342,83 @@ 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; +-------------------------------------------------------------------------------- +-- Node configuration files +-------------------------------------------------------------------------------- + +CREATE TABLE conf_files ( + conf_file_id serial PRIMARY KEY, -- Configuration file identifier + enabled bool NOT NULL DEFAULT true, -- Configuration file is active + source text NOT NULL, -- Relative path on the boot server where file can be downloaded + dest text NOT NULL, -- Absolute path where file should be installed + file_permissions text NOT NULL DEFAULT '0644', -- chmod(1) permissions + file_owner text NOT NULL DEFAULT 'root', -- chown(1) owner + file_group text NOT NULL DEFAULT 'root', -- chgrp(1) owner + preinstall_cmd text, -- Shell command to execute prior to installing + postinstall_cmd text, -- Shell command to execute after installing + error_cmd text, -- Shell command to execute if any error occurs + ignore_cmd_errors bool NOT NULL DEFAULT false, -- Install file anyway even if an error occurs + always_update bool NOT NULL DEFAULT false -- Always attempt to install file even if unchanged +); + +CREATE TABLE conf_file_node ( + conf_file_id integer REFERENCES conf_files NOT NULL, -- Configuration file identifier + node_id integer REFERENCES nodes NOT NULL, -- Node identifier + PRIMARY KEY (conf_file_id, node_id) +); +CREATE INDEX conf_file_node_conf_file_id_idx ON conf_file_node (conf_file_id); +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_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_accum(conf_file_id) AS conf_file_ids +FROM conf_file_node +GROUP BY node_id; + +CREATE TABLE conf_file_nodegroup ( + conf_file_id integer REFERENCES conf_files NOT NULL, -- Configuration file identifier + nodegroup_id integer REFERENCES nodegroups NOT NULL, -- Node group identifier + PRIMARY KEY (conf_file_id, nodegroup_id) +); +CREATE INDEX conf_file_nodegroup_conf_file_id_idx ON conf_file_nodegroup (conf_file_id); +CREATE INDEX conf_file_nodegroup_nodegroup_id_idx ON conf_file_nodegroup (nodegroup_id); + +-- Node groups linked to each configuration file +CREATE VIEW conf_file_nodegroups AS +SELECT conf_file_id, +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_accum(conf_file_id) AS conf_file_ids +FROM conf_file_nodegroup +GROUP BY nodegroup_id; + -------------------------------------------------------------------------------- -- Node network interfaces -------------------------------------------------------------------------------- @@ -315,7 +428,6 @@ CREATE TABLE network_types ( type text PRIMARY KEY -- Addressing scheme ) WITH OIDS; INSERT INTO network_types (type) VALUES ('ipv4'); -INSERT INTO network_types (type) VALUES ('ipv6'); -- Valid network configuration methods CREATE TABLE network_methods ( @@ -360,7 +472,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; @@ -386,7 +498,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; @@ -402,15 +514,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; @@ -428,7 +540,8 @@ INSERT INTO slice_instantiations (instantiation) VALUES ('delegated'); -- Manual -- Slices CREATE TABLE slices ( slice_id serial PRIMARY KEY, -- Slice identifier - site_id integer REFERENCES sites NOT NULL, -- Site identifier +-- xxx temporarily remove the NOT NULL constraint + site_id integer REFERENCES sites, -- 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 @@ -436,19 +549,21 @@ 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 +-- xxx temporarily remove the NOT NULL constraint + 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 - is_deleted boolean NOT NULL DEFAULT false + deleted boolean NOT NULL DEFAULT false ) WITH OIDS; -CREATE INDEX slices_site_id_idx ON slices (site_id) WHERE is_deleted IS false; -CREATE INDEX slices_name_idx ON slices (name) WHERE is_deleted IS false; +CREATE INDEX slices_site_id_idx ON slices (site_id) WHERE deleted IS false; +CREATE INDEX slices_name_idx ON slices (name) WHERE deleted IS false; -- Slivers CREATE TABLE slice_node ( slice_id integer REFERENCES slices NOT NULL, -- Slice identifier - node_id integer REFERENCES nodes NOT NULL -- Node identifier + node_id integer REFERENCES nodes NOT NULL, -- Node identifier + PRIMARY KEY (slice_id, node_id) ) WITH OIDS; CREATE INDEX slice_node_slice_id_idx ON slice_node (slice_id); CREATE INDEX slice_node_node_id_idx ON slice_node (node_id); @@ -460,24 +575,39 @@ 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 GROUP BY site_id; +-- Slices - peer relationship +CREATE TABLE peer_slice ( + peer_id integer REFERENCES peers NOT NULL, -- peer primary key + slice_id integer REFERENCES slices NOT NULL, -- node primary key + PRIMARY KEY (peer_id, slice_id) +) WITH OIDS; +CREATE INDEX peer_slice_peer_id_idx ON peer_slice (peer_id); +CREATE INDEX peer_slice_slice_id_idx ON peer_slice (slice_id); + +CREATE VIEW peer_slices AS +SELECT peer_id, +array_accum(slice_id) AS slice_ids +FROM peer_slice +GROUP BY peer_id; + -- Slice membership CREATE TABLE slice_person ( slice_id integer REFERENCES slices NOT NULL, -- Slice identifier @@ -490,19 +620,19 @@ 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; -------------------------------------------------------------------------------- --- Attributes +-- Slice attributes -------------------------------------------------------------------------------- -- Slice attribute types @@ -526,88 +656,135 @@ 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; -------------------------------------------------------------------------------- --- Events +-- Authenticated sessions -------------------------------------------------------------------------------- --- event types -CREATE TABLE event_types ( - event_type text PRIMARY KEY -- Event type +-- Authenticated sessions +CREATE TABLE sessions ( + session_id text PRIMARY KEY, -- Session identifier + expires timestamp without time zone +) WITH OIDS; +-- People can have multiple sessions +CREATE TABLE person_session ( + person_id integer REFERENCES persons NOT NULL, -- Account identifier + session_id text REFERENCES sessions NOT NULL, -- Session identifier + PRIMARY KEY (person_id, session_id), + UNIQUE (session_id) -- Sessions are unique ) WITH OIDS; +CREATE INDEX person_session_person_id_idx ON person_session (person_id); +-- Nodes can have only one session +CREATE TABLE node_session ( + node_id integer REFERENCES nodes NOT NULL, -- Node identifier + session_id text REFERENCES sessions NOT NULL, -- Session identifier + UNIQUE (node_id), -- Nodes can have only one session + UNIQUE (session_id) -- Sessions are unique +) WITH OIDS; + +-------------------------------------------------------------------------------- +-- Message templates +-------------------------------------------------------------------------------- + +CREATE TABLE messages ( + message_id text PRIMARY KEY, -- Message name + template text, -- Message template + enabled bool NOT NULL DEFAULT true -- Whether message is enabled +) WITH OIDS; + +-------------------------------------------------------------------------------- +-- 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 +-- Object types CREATE TABLE object_types ( - object_type text PRIMARY KEY -- Object type - + 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 ('Node'); +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 ('Address'); -INSERT INTO object_types (object_type) VALUES ('Attribute'); -INSERT INTO object_types (object_type) VALUES ('Key'); -INSERT INTO object_types (object_type) VALUES ('Nodegroup'); INSERT INTO object_types (object_type) VALUES ('Unknown'); --- fault types -CREATE TABLE fault_types ( - fault_code integer PRIMARY KEY, -- Fault identifier - fault_type text UNIQUE NOT NULL -- Fault type - -) WITH OIDS; - -INSERT INTO fault_types (fault_code, fault_type) VALUES (0, 'Success'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (100, 'PLCInvalidAPIMethod'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (101, 'PLCInvalidArgumentCount'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (102, 'PLCInvalidArgument'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (103, 'PLCAuthenticationFailure'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (109, 'PLCNotImplemented'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (106, 'PLCDBError'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (108, 'PLCPermissionDenied'); -INSERT INTO fault_types (fault_code, fault_type) VALUES (111, 'PLCAPIError'); - - --- events +-- Events CREATE TABLE events ( - event_id serial PRIMARY KEY, -- Event identifier - person_id integer REFERENCES persons NOT NULL, -- person responsible for event - 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 REFERENCES fault_types NOT NULL DEFAULT 0, -- did this event result in error - call text NOT NULL, -- Call name - - -- Optional - runtime float, -- Event run time - - -- Timestamps - time timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP - + 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 ) WITH OIDS; --- event objects -CREATE TABLE event_objects ( - event_id integer REFERENCES events NOT NULL, -- Event identifier - object_id integer NOT NULL -- Object identifier - +-- Event objects +CREATE TABLE event_object ( + event_id integer REFERENCES events NOT NULL, -- Event identifier + object_id integer NOT NULL -- Object identifier ) 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 VIEW event_objects AS +SELECT event_id, +array_accum(object_id) AS object_ids +FROM event_object +GROUP BY event_id; -------------------------------------------------------------------------------- -- Useful views -------------------------------------------------------------------------------- +CREATE VIEW view_events AS +SELECT +events.event_id, +events.person_id, +events.node_id, +events.event_type, +events.object_type, +events.fault_code, +events.call, +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); + CREATE VIEW view_persons AS SELECT persons.person_id, @@ -625,10 +802,11 @@ 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 +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) @@ -647,28 +825,81 @@ nodes.boot_nonce, nodes.version, nodes.ssh_rsa_key, nodes.key, -nodes.session, 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 +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) -LEFT JOIN node_pcus USING (node_id); +LEFT JOIN node_pcus USING (node_id) +LEFT JOIN node_conf_files USING (node_id) +LEFT JOIN node_session USING (node_id) +WHERE peer_node.peer_id IS NULL; + +CREATE VIEW view_peers AS +SELECT +peers.*, +peer_nodes.node_ids, +peer_slices.slice_ids +FROM peers +LEFT JOIN peer_nodes USING (peer_id) +LEFT JOIN peer_slices USING (peer_id); + +CREATE VIEW view_foreign_nodes AS +SELECT +nodes.node_id, +nodes.hostname, +peer_node.peer_id, +nodes.boot_state, +nodes.model, +nodes.version, +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_slices.slice_ids, '{}') AS slice_ids, +nodes.deleted +FROM nodes +LEFT JOIN peer_node USING (node_id) +LEFT JOIN node_slices USING (node_id) +WHERE peer_node.peer_id IS NOT NULL; CREATE VIEW view_nodegroups AS SELECT nodegroups.nodegroup_id, nodegroups.name, nodegroups.description, -nodegroup_nodes.node_ids +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_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, +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 @@ -681,8 +912,8 @@ pcus.username, pcus.password, pcus.model, pcus.notes, -pcu_nodes.node_ids, -pcu_nodes.ports +COALESCE(pcu_nodes.node_ids, '{}') AS node_ids, +COALESCE(pcu_nodes.ports, '{}') AS ports FROM pcus LEFT JOIN pcu_nodes USING (pcu_id); @@ -701,11 +932,11 @@ 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 +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 site_persons USING (site_id) LEFT JOIN site_nodes USING (site_id) @@ -716,7 +947,6 @@ LEFT JOIN site_pcus USING (site_id); CREATE VIEW view_addresses AS SELECT addresses.address_id, -addresses.site_id, addresses.line1, addresses.line2, addresses.line3, @@ -724,8 +954,8 @@ addresses.city, addresses.state, addresses.postalcode, addresses.country, -address_address_types.address_type_ids, -address_address_types.address_types +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); @@ -739,17 +969,40 @@ slices.url, slices.description, slices.max_nodes, slices.creator_person_id, -slices.is_deleted, +slices.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 +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); +LEFT JOIN slice_attributes USING (slice_id) +WHERE peer_slice.peer_id IS NULL +AND slices.site_id IS NOT NULL +AND slices.creator_person_id IS NOT NULL; + +CREATE VIEW view_foreign_slices AS +SELECT +slices.slice_id, +slices.name, +peer_slice.peer_id, +slices.instantiation, +slices.url, +slices.description, +slices.max_nodes, +slices.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 +FROM slices +LEFT JOIN peer_slice USING (slice_id) +LEFT JOIN slice_nodes USING (slice_id) +WHERE peer_slice.peer_id IS NOT NULL; +-- CREATE VIEW view_slice_attributes AS SELECT slice_attribute.slice_attribute_id, @@ -763,6 +1016,16 @@ slice_attribute.value FROM slice_attribute INNER JOIN slice_attribute_types USING (attribute_type_id); +CREATE VIEW view_sessions AS +SELECT +sessions.session_id, +CAST(date_part('epoch', sessions.expires) AS bigint) AS expires, +person_session.person_id, +node_session.node_id +FROM sessions +LEFT JOIN person_session USING (session_id) +LEFT JOIN node_session USING (session_id); + -------------------------------------------------------------------------------- -- Built-in maintenance account and default site -------------------------------------------------------------------------------- @@ -781,3 +1044,6 @@ INSERT INTO sites (login_base, name, abbreviated_name, max_slices) VALUES ('pl', 'PlanetLab Central', 'PLC', 100); + + +