X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab4.sql;h=76e99375ad4e2b9a481489c6729ebc430047af5a;hb=a74854dd38cb742b8fdc0d0cda7fff738a95312c;hp=550c22daae47209df06e83d91479c166b9c9d3df;hpb=06490a13ca944eeea8d5d8dfcc7c85444e16ad7a;p=plcapi.git diff --git a/planetlab4.sql b/planetlab4.sql index 550c22d..76e9937 100644 --- a/planetlab4.sql +++ b/planetlab4.sql @@ -9,9 +9,11 @@ -- -- Copyright (C) 2006 The Trustees of Princeton University -- --- $Id: planetlab4.sql,v 1.2 2006/09/25 18:34:48 mlhuang Exp $ +-- $Id$ -- +SET client_encoding = 'UNICODE'; + -------------------------------------------------------------------------------- -- Aggregates and store procedures -------------------------------------------------------------------------------- @@ -25,6 +27,18 @@ CREATE AGGREGATE array_accum ( initcond = '{}' ); +-------------------------------------------------------------------------------- +-- Version +-------------------------------------------------------------------------------- + +-- Database version +CREATE TABLE plc_db_version ( + version integer NOT NULL, + subversion integer NOT NULL DEFAULT 0 +) WITH OIDS; + +INSERT INTO plc_db_version (version, subversion) VALUES (4, 8); + -------------------------------------------------------------------------------- -- Accounts -------------------------------------------------------------------------------- @@ -40,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, @@ -53,8 +67,8 @@ 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 -); -CREATE INDEX persons_email_key ON persons (email); +) WITH OIDS; +CREATE INDEX persons_email_idx ON persons (email) WHERE deleted IS false; -------------------------------------------------------------------------------- -- Sites @@ -67,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 @@ -76,22 +91,23 @@ 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 -); -CREATE INDEX sites_login_base_key ON sites (login_base); +) WITH OIDS; +CREATE INDEX sites_login_base_idx ON sites (login_base) WHERE deleted IS false; -- Account site membership CREATE TABLE person_site ( - person_id integer REFERENCES persons, -- Account identifier - site_id integer REFERENCES sites, -- Site identifier + person_id integer REFERENCES persons NOT NULL, -- Account identifier + site_id integer REFERENCES sites NOT NULL, -- Site identifier is_primary boolean NOT NULL DEFAULT false, -- Is the primary site for this account PRIMARY KEY (person_id, site_id) ); -CREATE INDEX person_site_person_id_key ON person_site (person_id); -CREATE INDEX person_site_site_id_key ON person_site (site_id); +CREATE INDEX person_site_person_id_idx ON person_site (person_id); +CREATE INDEX person_site_site_id_idx ON person_site (site_id); -- Ordered by primary site first CREATE VIEW person_site_ordered AS @@ -102,14 +118,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; @@ -117,10 +133,20 @@ GROUP BY site_id; -- Mailing Addresses -------------------------------------------------------------------------------- +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 +INSERT INTO address_types (name) VALUES ('Billing'); + -- Mailing addresses CREATE TABLE addresses ( address_id serial PRIMARY KEY, -- Address identifier - address_type text, -- Address type, e.g. shipping or billing line1 text NOT NULL, -- Address line 1 line2 text, -- Address line 2 line3 text, -- Address line 3 @@ -128,20 +154,36 @@ CREATE TABLE addresses ( state text NOT NULL, -- State or province postalcode text NOT NULL, -- Postal code country text NOT NULL -- Country -); +) WITH OIDS; + +-- 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 + 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_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; --- Site mailing addresses CREATE TABLE site_address ( - site_id integer REFERENCES sites, -- Account identifier - address_id integer REFERENCES addresses, -- Address identifier + site_id integer REFERENCES sites NOT NULL, -- Site identifier + address_id integer REFERENCES addresses NOT NULL, -- Address identifier PRIMARY KEY (site_id, address_id) -); -CREATE INDEX site_address_site_id_key ON site_address (site_id); -CREATE INDEX site_address_address_id_key ON site_address (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 +array_accum(address_id) AS address_ids FROM site_address GROUP BY site_id; @@ -152,30 +194,27 @@ GROUP BY site_id; -- Valid key types CREATE TABLE key_types ( key_type text PRIMARY KEY -- Key type -); +) WITH OIDS; INSERT INTO key_types (key_type) VALUES ('ssh'); -- Authentication keys CREATE TABLE keys ( key_id serial PRIMARY KEY, -- Key identifier - key_type text REFERENCES key_types, -- Key type + 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 -); +) WITH OIDS; -- Account authentication key(s) CREATE TABLE person_key ( - person_id integer REFERENCES persons, -- Account identifier - key_id integer REFERENCES keys, -- Key identifier - is_primary boolean NOT NULL DEFAULT false, -- Is the primary key for this account - PRIMARY KEY (person_id, key_id) -); -CREATE INDEX person_key_person_id_key ON person_key (person_id); -CREATE INDEX person_key_key_id_key ON person_key (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 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; @@ -187,26 +226,24 @@ GROUP BY person_id; CREATE TABLE roles ( role_id integer PRIMARY KEY, -- Role identifier name text UNIQUE NOT NULL -- Role symbolic name -); +) WITH OIDS; 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, -- Account identifier - role_id integer REFERENCES roles, -- Role identifier + person_id integer REFERENCES persons NOT NULL, -- Account identifier + role_id integer REFERENCES roles NOT NULL, -- Role identifier PRIMARY KEY (person_id, role_id) -); -CREATE INDEX person_role_person_id_key ON person_role (person_id); +) WITH OIDS; +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; @@ -218,7 +255,7 @@ GROUP BY person_id; -- Valid node boot states CREATE TABLE boot_states ( boot_state text PRIMARY KEY -); +) WITH OIDS; INSERT INTO boot_states (boot_state) VALUES ('boot'); INSERT INTO boot_states (boot_state) VALUES ('dbg'); INSERT INTO boot_states (boot_state) VALUES ('inst'); @@ -231,31 +268,32 @@ CREATE TABLE nodes ( -- Mandatory node_id serial PRIMARY KEY, -- Node identifier hostname text NOT NULL, -- Node hostname - site_id integer REFERENCES sites, -- At which site - boot_state text REFERENCES boot_states, -- Node boot state + 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 -- Optional 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 - 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 -); -CREATE INDEX nodes_hostname_key ON nodes (hostname); -CREATE INDEX nodes_site_id_key ON nodes (site_id); + last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, + 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; -- 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 +WHERE deleted IS false GROUP BY site_id; -------------------------------------------------------------------------------- @@ -267,61 +305,123 @@ CREATE TABLE nodegroups ( nodegroup_id serial PRIMARY KEY, -- Group identifier name text UNIQUE NOT NULL, -- Group name description text -- Group description -); +) WITH OIDS; -- Node group membership CREATE TABLE nodegroup_node ( - nodegroup_id integer REFERENCES nodegroups, -- Group identifier - node_id integer REFERENCES nodes, -- Node identifier + nodegroup_id integer REFERENCES nodegroups NOT NULL, -- Group identifier + node_id integer REFERENCES nodes NOT NULL, -- Node identifier PRIMARY KEY (nodegroup_id, node_id) -); -CREATE INDEX nodegroup_node_nodegroup_id_key ON nodegroup_node (nodegroup_id); -CREATE INDEX nodegroup_node_node_id_key ON nodegroup_node (node_id); +) WITH OIDS; +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 -------------------------------------------------------------------------------- -- Valid network addressing schemes -CREATE TABLE nodenetwork_types ( +CREATE TABLE network_types ( type text PRIMARY KEY -- Addressing scheme -); -INSERT INTO nodenetwork_types (type) VALUES ('ipv4'); -INSERT INTO nodenetwork_types (type) VALUES ('ipv6'); +) WITH OIDS; +INSERT INTO network_types (type) VALUES ('ipv4'); -- Valid network configuration methods -CREATE TABLE nodenetwork_methods ( +CREATE TABLE network_methods ( method text PRIMARY KEY -- Configuration method -); -INSERT INTO nodenetwork_methods (method) VALUES ('static'); -INSERT INTO nodenetwork_methods (method) VALUES ('dhcp'); -INSERT INTO nodenetwork_methods (method) VALUES ('proxy'); -INSERT INTO nodenetwork_methods (method) VALUES ('tap'); -INSERT INTO nodenetwork_methods (method) VALUES ('ipmi'); -INSERT INTO nodenetwork_methods (method) VALUES ('unknown'); +) WITH OIDS; +INSERT INTO network_methods (method) VALUES ('static'); +INSERT INTO network_methods (method) VALUES ('dhcp'); +INSERT INTO network_methods (method) VALUES ('proxy'); +INSERT INTO network_methods (method) VALUES ('tap'); +INSERT INTO network_methods (method) VALUES ('ipmi'); +INSERT INTO network_methods (method) VALUES ('unknown'); -- Node network interfaces CREATE TABLE nodenetworks ( -- Mandatory nodenetwork_id serial PRIMARY KEY, -- Network interface identifier - node_id integer REFERENCES nodes, -- Which node + node_id integer REFERENCES nodes NOT NULL, -- Which node is_primary boolean NOT NULL DEFAULT false, -- Is the primary interface for this node - type text REFERENCES nodenetwork_types, -- Addressing scheme - method text REFERENCES nodenetwork_methods, -- Configuration method + type text REFERENCES network_types NOT NULL, -- Addressing scheme + method text REFERENCES network_methods NOT NULL, -- Configuration method -- Optional, depending on type and method ip text, -- IP address @@ -334,8 +434,8 @@ CREATE TABLE nodenetworks ( dns2 text, -- Secondary DNS server bwlimit integer, -- Bandwidth limit in bps hostname text -- Hostname of this interface -); -CREATE INDEX nodenetworks_node_id_key ON nodenetworks (node_id); +) WITH OIDS; +CREATE INDEX nodenetworks_node_id_idx ON nodenetworks (node_id); -- Ordered by primary interface first CREATE VIEW nodenetworks_ordered AS @@ -346,27 +446,140 @@ 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; +-------------------------------------------------------------------------------- +-- 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) +-------------------------------------------------------------------------------- + +CREATE TABLE pcus ( + -- Mandatory + pcu_id serial PRIMARY KEY, -- PCU identifier + site_id integer REFERENCES sites NOT NULL, -- Site identifier + hostname text, -- Hostname, not necessarily unique (multiple logical sites could use the same PCU) + ip text NOT NULL, -- IP, not necessarily unique + + -- Optional + protocol text, -- Protocol, e.g. ssh or https or telnet + username text, -- Username, if applicable + "password" text, -- Password, if applicable + model text, -- Model, e.g. BayTech or iPal + notes text -- Random notes +) WITH OIDS; +CREATE INDEX pcus_site_id_idx ON pcus (site_id); + +CREATE VIEW site_pcus AS +SELECT site_id, +array_accum(pcu_id) AS pcu_ids +FROM pcus +GROUP BY site_id; + +CREATE TABLE pcu_node ( + pcu_id integer REFERENCES pcus NOT NULL, -- PCU identifier + node_id integer REFERENCES nodes NOT NULL, -- Node identifier + port integer NOT NULL, -- Port number + PRIMARY KEY (pcu_id, node_id), -- The same node cannot be controlled by different ports + UNIQUE (pcu_id, port) -- The same port cannot control multiple nodes +); +CREATE INDEX pcu_node_pcu_id_idx ON pcu_node (pcu_id); +CREATE INDEX pcu_node_node_id_idx ON pcu_node (node_id); + +CREATE VIEW node_pcus AS +SELECT node_id, +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_accum(node_id) AS node_ids, +array_accum(port) AS ports +FROM pcu_node +GROUP BY pcu_id; + -------------------------------------------------------------------------------- -- Slices -------------------------------------------------------------------------------- CREATE TABLE slice_instantiations ( instantiation text PRIMARY KEY -); +) WITH OIDS; 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, -- Site identifier + site_id integer REFERENCES sites NOT NULL, -- Site identifier + name text NOT NULL, -- Slice name - instantiation text REFERENCES slice_instantiations DEFAULT 'plc-instantiated', -- Slice state, e.g. plc-instantiated + instantiation text REFERENCES slice_instantiations NOT NULL DEFAULT 'plc-instantiated', -- Slice state, e.g. plc-instantiated url text, -- Project URL description text, -- Project description @@ -377,17 +590,18 @@ CREATE TABLE slices ( expires timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP + '2 weeks', -- Expiration date is_deleted boolean NOT NULL DEFAULT false -); -CREATE INDEX slices_site_id_key ON slices (site_id); -CREATE INDEX slices_name_key ON slices (name); +) 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; -- Slivers CREATE TABLE slice_node ( - slice_id integer REFERENCES slices, -- Slice identifier - node_id integer REFERENCES nodes -- Node identifier -); -CREATE INDEX slice_node_slice_id_key ON slice_node (slice_id); -CREATE INDEX slice_node_node_id_key ON slice_node (node_id); + slice_id integer REFERENCES slices NOT NULL, -- Slice 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); -- Synonym for slice_node CREATE VIEW slivers AS @@ -396,83 +610,313 @@ 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 CREATE TABLE slice_person ( - slice_id integer REFERENCES slices, -- Slice identifier - person_id integer REFERENCES persons, -- Account identifier + slice_id integer REFERENCES slices NOT NULL, -- Slice identifier + person_id integer REFERENCES persons NOT NULL, -- Account identifier PRIMARY KEY (slice_id, person_id) -); -CREATE INDEX slice_person_slice_id_key ON slice_person (slice_id); -CREATE INDEX slice_person_person_id_key ON slice_person (person_id); +) WITH OIDS; +CREATE INDEX slice_person_slice_id_idx ON slice_person (slice_id); +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; +-------------------------------------------------------------------------------- +-- 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 -------------------------------------------------------------------------------- -CREATE TABLE attributes ( - attribute_id serial PRIMARY KEY, -- Attribute identifier +-- Slice attribute types +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 -- 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 +) WITH OIDS; -- Slice/sliver attributes CREATE TABLE slice_attribute ( - slice_id integer REFERENCES slices, -- Slice identifier - attribute_id integer REFERENCES attributes, -- Attribute identifier - node_id integer, -- Sliver attribute if set - value text, - PRIMARY KEY (slice_id, attribute_id, node_id) -); -CREATE INDEX slice_attribute_slice_id_key ON slice_attribute (slice_id); -CREATE INDEX slice_attribute_node_id_key ON slice_attribute (node_id); + 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 +) 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, -array_to_string(array_accum(attribute_id), ',') AS attribute_ids +array_accum(slice_attribute_id) AS slice_attribute_ids FROM slice_attribute -WHERE node_id IS NULL GROUP BY slice_id; --- No sliver_attributes view since it by definition requires a conditional on node_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 +-------------------------------------------------------------------------------- + +-- 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 +-------------------------------------------------------------------------------- + +-- 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 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; + +-- 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_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 OR REPLACE VIEW event_objects AS +SELECT event_id, +array_accum(object_id) AS object_ids, +array_accum(object_type) AS object_types +FROM event_object +GROUP BY event_id; -------------------------------------------------------------------------------- -- Useful views -------------------------------------------------------------------------------- -CREATE VIEW view_persons AS +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 OR REPLACE VIEW view_event_objects AS +SELECT +events.event_id, +events.person_id, +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, +event_object.object_id, +event_object.object_type +FROM events LEFT JOIN event_object USING (event_id); + +CREATE OR REPLACE VIEW view_persons AS SELECT persons.person_id, persons.email, @@ -482,24 +926,39 @@ 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((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 -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_nodes AS +LEFT JOIN peer_person USING (person_id); + +CREATE OR REPLACE VIEW view_peers AS +SELECT +peers.*, +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, @@ -511,67 +970,89 @@ 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 +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 peer_node USING (node_id) +LEFT JOIN node_session USING (node_id); + +CREATE OR REPLACE VIEW view_nodegroups AS +SELECT +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 VIEW view_nodegroups AS +CREATE OR REPLACE VIEW view_conf_files AS SELECT -nodegroups.nodegroup_id, -nodegroups.name, -nodegroups.description, -nodegroup_nodes.node_ids -FROM nodegroups -LEFT JOIN nodegroup_nodes USING (nodegroup_id); - -CREATE VIEW view_sites 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.*, +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 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.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, -site_persons.person_ids, -site_nodes.node_ids, -site_addresses.address_ids, -site_slices.slice_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 peer_site USING (site_id); -CREATE VIEW view_addresses AS +CREATE OR REPLACE VIEW view_addresses AS SELECT -addresses.address_id, -addresses.address_type, -addresses.line1, -addresses.line2, -addresses.line3, -addresses.city, -addresses.state, -addresses.postalcode, -addresses.country, -site_address.site_id -FROM addresses -LEFT JOIN site_address USING (address_id); - -CREATE VIEW view_slices AS +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 OR REPLACE 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 OR REPLACE VIEW view_slices AS SELECT slices.slice_id, slices.site_id, @@ -584,13 +1065,37 @@ 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.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 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 +FROM slice_attribute +INNER JOIN slice_attribute_types USING (attribute_type_id); + +CREATE OR REPLACE 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