X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab4.sql;h=c6642a6ea783600eb4db10baafbbee7bfdcff9c0;hb=3ff00e1e8de8b8109c0f625950176a78dbcc2182;hp=03147d3bd65aa3a237133bebbe4b2e5ae9482c26;hpb=f35456b0587903fedeac180f682cc1ea72d0640f;p=plcapi.git diff --git a/planetlab4.sql b/planetlab4.sql index 03147d3..c6642a6 100644 --- a/planetlab4.sql +++ b/planetlab4.sql @@ -9,7 +9,7 @@ -- -- Copyright (C) 2006 The Trustees of Princeton University -- --- $Id: planetlab4.sql,v 1.19 2006/10/20 19:00:41 tmack Exp $ +-- $Id: planetlab4.sql,v 1.49 2006/11/28 14:54:59 thierry Exp $ -- -------------------------------------------------------------------------------- @@ -25,6 +25,33 @@ 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); + +-------------------------------------------------------------------------------- +-- 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 + person_id integer NOT NULL, -- the account we use for logging in + + deleted boolean NOT NULL DEFAULT false +) WITH OIDS; + -------------------------------------------------------------------------------- -- Accounts -------------------------------------------------------------------------------- @@ -52,7 +79,9 @@ 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 + last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, + + peer_id integer REFERENCES peers -- From which peer ) WITH OIDS; CREATE INDEX persons_email_idx ON persons (email) WHERE deleted IS false; @@ -79,7 +108,9 @@ CREATE TABLE sites ( -- Timestamps date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, - last_updated 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 ) WITH OIDS; CREATE INDEX sites_login_base_idx ON sites (login_base) WHERE deleted IS false; @@ -102,14 +133,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; @@ -131,7 +162,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 @@ -144,21 +174,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; -------------------------------------------------------------------------------- @@ -176,7 +217,8 @@ 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 + is_blacklisted boolean NOT NULL DEFAULT false, -- Has been blacklisted + peer_id integer REFERENCES peers -- From which peer ) WITH OIDS; -- Account authentication key(s) @@ -190,7 +232,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; @@ -209,6 +251,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 @@ -220,8 +264,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; @@ -246,7 +290,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 @@ -257,11 +302,12 @@ 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, - last_updated 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 ) 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; @@ -269,7 +315,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; @@ -293,17 +339,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; @@ -337,14 +383,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; @@ -359,14 +405,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; @@ -379,7 +425,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 ( @@ -424,7 +469,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; @@ -450,7 +495,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; @@ -466,15 +511,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; @@ -493,6 +538,8 @@ 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 + 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 url text, -- Project URL @@ -512,7 +559,8 @@ CREATE INDEX slices_name_idx ON slices (name) WHERE is_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); @@ -524,22 +572,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 @@ -554,14 +603,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; @@ -574,7 +623,9 @@ 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 + 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 ) WITH OIDS; -- Slice/sliver attributes @@ -583,27 +634,65 @@ CREATE TABLE slice_attribute ( slice_id integer REFERENCES slices NOT NULL, -- Slice identifier node_id integer REFERENCES nodes, -- Sliver attribute if set attribute_type_id integer REFERENCES slice_attribute_types NOT NULL, -- Attribute type identifier - value text + value text, + + peer_id integer REFERENCES peers -- From which peer ) 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 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 + subject text, -- Message summary + 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'); @@ -612,18 +701,17 @@ 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 ('Message'); INSERT INTO object_types (object_type) VALUES ('NetworkMethod'); INSERT INTO object_types (object_type) VALUES ('NetworkType'); INSERT INTO object_types (object_type) VALUES ('Network'); @@ -631,63 +719,63 @@ INSERT INTO object_types (object_type) VALUES ('NodeGroup'); INSERT INTO object_types (object_type) VALUES ('NodeNetwork'); INSERT INTO object_types (object_type) VALUES ('Node'); INSERT INTO object_types (object_type) VALUES ('PCU'); +INSERT INTO object_types (object_type) VALUES ('Peer'); INSERT INTO object_types (object_type) VALUES ('Person'); INSERT INTO object_types (object_type) VALUES ('Role'); +INSERT INTO object_types (object_type) VALUES ('Session'); INSERT INTO object_types (object_type) VALUES ('Site'); INSERT INTO object_types (object_type) VALUES ('SliceAttributeType'); INSERT INTO object_types (object_type) VALUES ('SliceAttribute'); INSERT INTO object_types (object_type) VALUES ('Slice'); +INSERT INTO object_types (object_type) VALUES ('SliceInstantiation'); INSERT INTO object_types (object_type) VALUES ('Unknown'); --- events +-- Events CREATE TABLE events ( - event_id serial PRIMARY KEY, -- Event identifier - person_id integer REFERENCES persons, -- 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 NOT NULL DEFAULT 0, -- did this event result in error - call text NOT NULL, -- call responsible for this event - 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 +-- Event objects CREATE TABLE event_object ( - event_id integer REFERENCES events NOT NULL, -- Event identifier - object_id integer NOT NULL -- Object identifier - + 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_to_string(array_accum(object_id), ',') AS object_ids +array_accum(object_id) AS object_ids FROM event_object 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.node_id, events.event_type, events.object_type, events.fault_code, events.call, -events.time -From events +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); --- view_persons CREATE VIEW view_persons AS SELECT persons.person_id, @@ -703,23 +791,48 @@ 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, -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) LEFT JOIN person_keys USING (person_id) LEFT JOIN person_slices USING (person_id); +-- Nodes at each peer +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 +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_nodes AS SELECT nodes.node_id, nodes.hostname, nodes.site_id, +nodes.peer_id, nodes.boot_state, nodes.deleted, nodes.model, @@ -727,29 +840,30 @@ 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, -node_conf_files.conf_file_ids +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 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 node_conf_files USING (node_id) +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 +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); @@ -768,8 +882,8 @@ 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 +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); @@ -785,8 +899,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); @@ -803,13 +917,14 @@ sites.max_slivers, sites.latitude, sites.longitude, sites.url, +sites.peer_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, -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) @@ -820,7 +935,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, @@ -828,8 +942,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); @@ -837,6 +951,7 @@ CREATE VIEW view_slices AS SELECT slices.slice_id, slices.site_id, +slices.peer_id, slices.name, slices.instantiation, slices.url, @@ -846,14 +961,15 @@ 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 +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 slice_nodes USING (slice_id) LEFT JOIN slice_persons USING (slice_id) LEFT JOIN slice_attributes USING (slice_id); +-- CREATE VIEW view_slice_attributes AS SELECT slice_attribute.slice_attribute_id, @@ -863,10 +979,21 @@ 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.value, +slice_attribute.peer_id 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 -------------------------------------------------------------------------------- @@ -885,3 +1012,6 @@ INSERT INTO sites (login_base, name, abbreviated_name, max_slices) VALUES ('pl', 'PlanetLab Central', 'PLC', 100); + + +