X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab5.sql;h=710e436cb1e0bf2f3164d80fa86ad20ce4f9155b;hb=25ca2c2fee216af894640248b6d83939f31ca327;hp=fd59559330de3d4d1e0fea52eacc8c95de65d6d0;hpb=0cdd9755cd0e13828ef35718862f392241263203;p=plcapi.git diff --git a/planetlab5.sql b/planetlab5.sql index fd59559..710e436 100644 --- a/planetlab5.sql +++ b/planetlab5.sql @@ -139,8 +139,11 @@ CREATE TABLE address_types ( description text -- Address type description ) WITH OIDS; +-- Multi-rows insertion "insert .. values (row1), (row2)" is not supported by pgsql-8.1 -- 'Billing' Used to be 'Site' -INSERT INTO address_types (name) VALUES ('Personal'), ('Shipping'), ('Billing'); +INSERT INTO address_types (name) VALUES ('Personal'); +INSERT INTO address_types (name) VALUES ('Shipping'); +INSERT INTO address_types (name) VALUES ('Billing'); -- Mailing addresses CREATE TABLE addresses ( @@ -225,7 +228,10 @@ 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'), (20, 'pi'), (30, 'user'), (40, 'tech'); +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'); CREATE TABLE person_role ( person_id integer REFERENCES persons NOT NULL, -- Account identifier @@ -247,20 +253,33 @@ GROUP BY person_id; -- Nodes -------------------------------------------------------------------------------- --- Valid node boot states +-- Valid node boot states (Nodes.py expect max length to be 20) CREATE TABLE boot_states ( boot_state text PRIMARY KEY ) WITH OIDS; -INSERT INTO boot_states (boot_state) - VALUES ('boot'), ('safeboot'), ('failboot'), ('disabled'), ('install'), ('reinstall'); +INSERT INTO boot_states (boot_state) VALUES ('boot'); +INSERT INTO boot_states (boot_state) VALUES ('safeboot'); +INSERT INTO boot_states (boot_state) VALUES ('failboot'); +INSERT INTO boot_states (boot_state) VALUES ('disabled'); +INSERT INTO boot_states (boot_state) VALUES ('install'); +INSERT INTO boot_states (boot_state) VALUES ('reinstall'); + +-- Known node types (Nodes.py expect max length to be 20) +CREATE TABLE node_types ( + node_type text PRIMARY KEY +) WITH OIDS; +INSERT INTO node_types (node_type) VALUES ('regular'); +INSERT INTO node_types (node_type) VALUES ('dummynet'); -- Nodes CREATE TABLE nodes ( -- Mandatory node_id serial PRIMARY KEY, -- Node identifier + node_type text REFERENCES node_types -- node type + DEFAULT 'regular', + hostname text NOT NULL, -- Node hostname site_id integer REFERENCES sites NOT NULL, -- At which site - boot_state text REFERENCES boot_states NOT NULL -- Node boot state DEFAULT 'install', deleted boolean NOT NULL DEFAULT false, -- Is deleted @@ -304,30 +323,9 @@ CREATE TABLE node_tag ( node_tag_id serial PRIMARY KEY, -- ID node_id integer REFERENCES nodes NOT NULL, -- node id tag_type_id integer REFERENCES tag_types, -- tag type id - tagvalue text -- value attached + value text -- value attached ) WITH OIDS; -CREATE OR REPLACE VIEW node_tags AS -SELECT node_id, -array_accum(node_tag_id) AS tag_ids -FROM node_tag -GROUP BY node_id; - -CREATE OR REPLACE VIEW view_node_tags AS -SELECT -node_tag.node_tag_id, -node_tag.node_id, -nodes.hostname, -tag_types.tag_type_id, -tag_types.tagname, -tag_types.description, -tag_types.category, -tag_types.min_role_id, -node_tag.tagvalue -FROM node_tag -INNER JOIN tag_types USING (tag_type_id) -INNER JOIN nodes USING (node_id); - -------------------------------------------------------------------------------- -- (network) interfaces -------------------------------------------------------------------------------- @@ -342,8 +340,13 @@ INSERT INTO network_types (type) VALUES ('ipv4'); CREATE TABLE network_methods ( method text PRIMARY KEY -- Configuration method ) WITH OIDS; -INSERT INTO network_methods (method) VALUES - ('static'), ('dhcp'), ('proxy'), ('tap'), ('ipmi'), ('unknown'); + +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 interfaces ( @@ -382,33 +385,33 @@ FROM interfaces_ordered GROUP BY node_id; -------------------------------------------------------------------------------- --- Interface settings +-- Interface tags (formerly known as interface settings) -------------------------------------------------------------------------------- -CREATE TABLE interface_setting ( - interface_setting_id serial PRIMARY KEY, -- Interface Setting Identifier +CREATE TABLE interface_tag ( + interface_tag_id serial PRIMARY KEY, -- Interface Setting Identifier interface_id integer REFERENCES interfaces NOT NULL,-- the interface this applies to tag_type_id integer REFERENCES tag_types NOT NULL, -- the setting type value text -- value attached ) WITH OIDS; -CREATE OR REPLACE VIEW interface_settings AS +CREATE OR REPLACE VIEW interface_tags AS SELECT interface_id, -array_accum(interface_setting_id) AS interface_setting_ids -FROM interface_setting +array_accum(interface_tag_id) AS interface_tag_ids +FROM interface_tag GROUP BY interface_id; -CREATE OR REPLACE VIEW view_interface_settings AS +CREATE OR REPLACE VIEW view_interface_tags AS SELECT -interface_setting.interface_setting_id, -interface_setting.interface_id, +interface_tag.interface_tag_id, +interface_tag.interface_id, tag_types.tag_type_id, tag_types.tagname, tag_types.description, tag_types.category, tag_types.min_role_id, -interface_setting.value -FROM interface_setting +interface_tag.value +FROM interface_tag INNER JOIN tag_types USING (tag_type_id); CREATE OR REPLACE VIEW view_interfaces AS @@ -428,7 +431,7 @@ interfaces.dns1, interfaces.dns2, interfaces.bwlimit, interfaces.hostname, -COALESCE((SELECT interface_setting_ids FROM interface_settings WHERE interface_settings.interface_id = interfaces.interface_id), '{}') AS interface_setting_ids +COALESCE((SELECT interface_tag_ids FROM interface_tags WHERE interface_tags.interface_id = interfaces.interface_id), '{}') AS interface_tag_ids FROM interfaces; -------------------------------------------------------------------------------- @@ -474,7 +477,7 @@ CREATE TABLE nodegroups ( groupname text UNIQUE NOT NULL, -- Group name tag_type_id integer REFERENCES tag_types, -- node is in nodegroup if it has this tag defined -- can be null, make management faster & easier - tagvalue text -- with this value attached + value text -- with this value attached ) WITH OIDS; -- xxx - first rough implem. similar to former semantics but might be slow @@ -484,7 +487,7 @@ FROM tag_types JOIN node_tag USING (tag_type_id) JOIN nodegroups -USING (tag_type_id,tagvalue); +USING (tag_type_id,value); CREATE OR REPLACE VIEW nodegroup_nodes AS SELECT nodegroup_id, @@ -621,11 +624,10 @@ GROUP BY pcu_id; CREATE TABLE slice_instantiations ( instantiation text PRIMARY KEY ) WITH OIDS; -INSERT INTO slice_instantiations (instantiation) VALUES - ('not-instantiated'), -- Placeholder slice - ('plc-instantiated'), -- Instantiated by Node Manager - ('delegated'), -- Manually instantiated - ('nm-controller'); -- NM Controller +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 ( @@ -729,27 +731,21 @@ FROM node_slice_whitelist GROUP BY node_id; -------------------------------------------------------------------------------- --- Slice attributes +-- Slice tags (formerly known as slice attributes) -------------------------------------------------------------------------------- -- Slice/sliver attributes -CREATE TABLE slice_attribute ( - slice_attribute_id serial PRIMARY KEY, -- Slice attribute identifier +CREATE TABLE slice_tag ( + slice_tag_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 tag_type_id integer REFERENCES tag_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 OR REPLACE VIEW slice_attributes AS -SELECT slice_id, -array_accum(slice_attribute_id) AS slice_attribute_ids -FROM slice_attribute -GROUP BY slice_id; +CREATE INDEX slice_tag_slice_id_idx ON slice_tag (slice_id); +CREATE INDEX slice_tag_node_id_idx ON slice_tag (node_id); +CREATE INDEX slice_tag_nodegroup_id_idx ON slice_tag (nodegroup_id); -------------------------------------------------------------------------------- -- Initscripts @@ -970,6 +966,7 @@ COALESCE((SELECT pcu_protocol_type_ids FROM pcu_protocol_types AS pcu_protocol_type_ids FROM pcu_types; +-------------------------------------------------------------------------------- CREATE OR REPLACE VIEW view_events AS SELECT events.event_id, @@ -1001,6 +998,7 @@ 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, @@ -1028,6 +1026,7 @@ COALESCE((SELECT slice_ids FROM person_slices WHERE person_slices.person_id = pe FROM persons LEFT JOIN peer_person USING (person_id); +-------------------------------------------------------------------------------- CREATE OR REPLACE VIEW view_peers AS SELECT peers.*, @@ -1043,9 +1042,32 @@ COALESCE((SELECT slice_ids FROM peer_slices WHERE peer_slices.peer_id = peers.pe 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 node_tags AS +SELECT node_id, +array_accum(node_tag_id) AS node_tag_ids +FROM node_tag +GROUP BY node_id; + +CREATE OR REPLACE VIEW view_node_tags AS +SELECT +node_tag.node_tag_id, +node_tag.node_id, +nodes.hostname, +tag_types.tag_type_id, +tag_types.tagname, +tag_types.description, +tag_types.category, +tag_types.min_role_id, +node_tag.value +FROM node_tag +INNER JOIN tag_types USING (tag_type_id) +INNER JOIN nodes USING (node_id); + CREATE OR REPLACE VIEW view_nodes AS SELECT nodes.node_id, +nodes.node_type, nodes.hostname, nodes.site_id, nodes.boot_state, @@ -1081,14 +1103,15 @@ AS ports, COALESCE((SELECT conf_file_ids FROM node_conf_files WHERE node_conf_files.node_id = nodes.node_id), '{}') AS conf_file_ids, -COALESCE((SELECT tag_ids FROM node_tags +COALESCE((SELECT node_tag_ids FROM node_tags WHERE node_tags.node_id = nodes.node_id), '{}') -AS tag_ids, +AS node_tag_ids, node_session.session_id AS session FROM nodes LEFT JOIN peer_node USING (node_id) LEFT JOIN node_session USING (node_id); +-------------------------------------------------------------------------------- CREATE OR REPLACE VIEW view_nodegroups AS SELECT nodegroups.*, @@ -1101,6 +1124,7 @@ COALESCE((SELECT node_ids FROM nodegroup_nodes AS node_ids FROM nodegroups INNER JOIN tag_types USING (tag_type_id); +-------------------------------------------------------------------------------- CREATE OR REPLACE VIEW view_conf_files AS SELECT conf_files.*, @@ -1112,6 +1136,7 @@ COALESCE((SELECT nodegroup_ids FROM conf_file_nodegroups AS nodegroup_ids FROM conf_files; +-------------------------------------------------------------------------------- CREATE OR REPLACE VIEW view_pcus AS SELECT pcus.*, @@ -1119,6 +1144,7 @@ COALESCE((SELECT node_ids FROM pcu_nodes WHERE pcu_nodes.pcu_id = pcus.pcu_id), 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, @@ -1146,6 +1172,7 @@ COALESCE((SELECT pcu_ids FROM site_pcus WHERE site_pcus.site_id = sites.site_id) FROM sites LEFT JOIN peer_site USING (site_id); +-------------------------------------------------------------------------------- CREATE OR REPLACE VIEW view_addresses AS SELECT addresses.*, @@ -1153,6 +1180,7 @@ COALESCE((SELECT address_type_ids FROM address_address_types WHERE address_addre 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.*, @@ -1163,6 +1191,13 @@ FROM keys LEFT JOIN person_key USING (key_id) LEFT JOIN peer_key USING (key_id); +-------------------------------------------------------------------------------- +CREATE OR REPLACE VIEW slice_tags AS +SELECT slice_id, +array_accum(slice_tag_id) AS slice_tag_ids +FROM slice_tag +GROUP BY slice_id; + CREATE OR REPLACE VIEW view_slices AS SELECT slices.slice_id, @@ -1180,25 +1215,26 @@ 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 +COALESCE((SELECT slice_tag_ids FROM slice_tags WHERE slice_tags.slice_id = slices.slice_id), '{}') AS slice_tag_ids FROM slices LEFT JOIN peer_slice USING (slice_id); -CREATE OR REPLACE VIEW view_slice_attributes AS +CREATE OR REPLACE VIEW view_slice_tags AS SELECT -slice_attribute.slice_attribute_id, -slice_attribute.slice_id, -slice_attribute.node_id, -slice_attribute.nodegroup_id, +slice_tag.slice_tag_id, +slice_tag.slice_id, +slice_tag.node_id, +slice_tag.nodegroup_id, tag_types.tag_type_id, tag_types.tagname, tag_types.description, tag_types.category, tag_types.min_role_id, -slice_attribute.value -FROM slice_attribute +slice_tag.value +FROM slice_tag INNER JOIN tag_types USING (tag_type_id); +-------------------------------------------------------------------------------- CREATE OR REPLACE VIEW view_sessions AS SELECT sessions.session_id, @@ -1213,15 +1249,13 @@ LEFT JOIN node_session USING (session_id); -- Built-in maintenance account and default site -------------------------------------------------------------------------------- -INSERT INTO persons -(first_name, last_name, email, password, enabled) -VALUES -('Maintenance', 'Account', 'maint@localhost.localdomain', 'nopass', true); +INSERT INTO persons (first_name, last_name, email, password, enabled) +VALUES ('Maintenance', 'Account', 'maint@localhost.localdomain', 'nopass', true); -INSERT INTO person_role (person_id, role_id) - VALUES (1, 10), (1, 20), (1, 30), (1, 40); +INSERT INTO person_role (person_id, role_id) VALUES (1, 10); +INSERT INTO person_role (person_id, role_id) VALUES (1, 20); +INSERT INTO person_role (person_id, role_id) VALUES (1, 30); +INSERT INTO person_role (person_id, role_id) VALUES (1, 40); -INSERT INTO sites -(login_base, name, abbreviated_name, max_slices) -VALUES -('pl', 'PlanetLab Central', 'PLC', 100); +INSERT INTO sites (login_base, name, abbreviated_name, max_slices) +VALUES ('pl', 'PlanetLab Central', 'PLC', 100);