-
+--
-- PlanetLab Central database schema
-- Version 4, PostgreSQL
--
--
-- Copyright (C) 2006 The Trustees of Princeton University
--
--- $Id: planetlab4.sql,v 1.4 2006/10/03 19:24:15 mlhuang Exp $
+-- $Id: planetlab4.sql,v 1.20 2006/10/23 16:25:46 tmack Exp $
--
--------------------------------------------------------------------------------
date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP
) WITH OIDS;
-CREATE INDEX persons_email_key ON persons (email) WHERE deleted IS false;
+CREATE INDEX persons_email_idx ON persons (email) WHERE deleted IS false;
--------------------------------------------------------------------------------
-- Sites
date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP
) WITH OIDS;
-CREATE INDEX sites_login_base_key ON sites (login_base) WHERE deleted IS false;
+CREATE INDEX sites_login_base_idx ON sites (login_base) WHERE deleted IS false;
-- Account site membership
CREATE TABLE person_site (
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
-- 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
+ 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
country text NOT NULL -- Country
) WITH OIDS;
--- Site mailing addresses
-CREATE TABLE site_address (
- site_id integer REFERENCES sites NOT NULL, -- Account identifier
+-- Each mailing address can be one of several types
+CREATE TABLE address_address_type (
address_id integer REFERENCES addresses NOT NULL, -- Address identifier
- PRIMARY KEY (site_id, address_id)
+ address_type_id integer REFERENCES address_types NOT NULL -- Address type
) WITH OIDS;
-CREATE INDEX site_address_site_id_key ON site_address (site_id);
-CREATE INDEX site_address_address_id_key ON site_address (address_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
+FROM address_address_type
+LEFT JOIN address_types USING (address_type_id)
+GROUP BY address_id;
CREATE VIEW site_addresses AS
SELECT site_id,
array_to_string(array_accum(address_id), ',') AS address_ids
-FROM site_address
+FROM addresses
GROUP BY site_id;
--------------------------------------------------------------------------------
CREATE TABLE person_key (
person_id integer REFERENCES persons NOT NULL, -- Account identifier
key_id integer REFERENCES keys NOT NULL, -- Key identifier
- is_primary boolean NOT NULL DEFAULT false, -- Is the primary key for this account
PRIMARY KEY (person_id, key_id)
) WITH OIDS;
-CREATE INDEX person_key_person_id_key ON person_key (person_id);
-CREATE INDEX person_key_key_id_key ON person_key (key_id);
+CREATE INDEX person_key_person_id_idx ON person_key (person_id);
+CREATE INDEX person_key_key_id_idx ON person_key (key_id);
CREATE VIEW person_keys AS
SELECT person_id,
role_id integer REFERENCES roles NOT NULL, -- Role identifier
PRIMARY KEY (person_id, role_id)
) WITH OIDS;
-CREATE INDEX person_role_person_id_key ON person_role (person_id);
+CREATE INDEX person_role_person_id_idx ON person_role (person_id);
-- Account roles
CREATE VIEW person_roles AS
node_id serial PRIMARY KEY, -- Node identifier
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
+ boot_state text REFERENCES boot_states NOT NULL DEFAULT 'inst', -- Node boot state
deleted boolean NOT NULL DEFAULT false, -- Is deleted
-- Optional
date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP
) WITH OIDS;
-CREATE INDEX nodes_hostname_key ON nodes (hostname) WHERE deleted IS false;
-CREATE INDEX nodes_site_id_key ON nodes (site_id) WHERE deleted IS false;
+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
node_id integer REFERENCES nodes NOT NULL, -- Node identifier
PRIMARY KEY (nodegroup_id, node_id)
) WITH OIDS;
-CREATE INDEX nodegroup_node_nodegroup_id_key ON nodegroup_node (nodegroup_id);
-CREATE INDEX nodegroup_node_node_id_key ON nodegroup_node (node_id);
+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
CREATE VIEW nodegroup_nodes AS
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_to_string(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
+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_to_string(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
+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
) WITH OIDS;
-INSERT INTO nodenetwork_types (type) VALUES ('ipv4');
-INSERT INTO nodenetwork_types (type) VALUES ('ipv6');
+INSERT INTO network_types (type) VALUES ('ipv4');
+INSERT INTO network_types (type) VALUES ('ipv6');
-- Valid network configuration methods
-CREATE TABLE nodenetwork_methods (
+CREATE TABLE network_methods (
method text PRIMARY KEY -- Configuration method
) WITH OIDS;
-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');
+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 (
nodenetwork_id serial PRIMARY KEY, -- Network interface identifier
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 NOT NULL, -- Addressing scheme
- method text REFERENCES nodenetwork_methods NOT NULL, -- 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
bwlimit integer, -- Bandwidth limit in bps
hostname text -- Hostname of this interface
) WITH OIDS;
-CREATE INDEX nodenetworks_node_id_key ON nodenetworks (node_id);
+CREATE INDEX nodenetworks_node_id_idx ON nodenetworks (node_id);
-- Ordered by primary interface first
CREATE VIEW nodenetworks_ordered AS
FROM nodenetworks_ordered
GROUP BY node_id;
+--------------------------------------------------------------------------------
+-- 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_to_string(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_to_string(array_accum(pcu_id), ',') AS pcu_ids,
+array_to_string(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
+FROM pcu_node
+GROUP BY pcu_id;
+
--------------------------------------------------------------------------------
-- Slices
--------------------------------------------------------------------------------
is_deleted boolean NOT NULL DEFAULT false
) WITH OIDS;
-CREATE INDEX slices_site_id_key ON slices (site_id) WHERE is_deleted IS false;
-CREATE INDEX slices_name_key ON slices (name) WHERE is_deleted IS false;
+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 NOT NULL, -- Slice identifier
node_id integer REFERENCES nodes NOT NULL -- Node identifier
) WITH OIDS;
-CREATE INDEX slice_node_slice_id_key ON slice_node (slice_id);
-CREATE INDEX slice_node_node_id_key ON slice_node (node_id);
+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
person_id integer REFERENCES persons NOT NULL, -- Account identifier
PRIMARY KEY (slice_id, person_id)
) WITH OIDS;
-CREATE INDEX slice_person_slice_id_key ON slice_person (slice_id);
-CREATE INDEX slice_person_person_id_key ON slice_person (person_id);
+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
GROUP BY person_id;
--------------------------------------------------------------------------------
--- Attributes
+-- Slice attributes
--------------------------------------------------------------------------------
--- Generic attribute types
-CREATE TABLE attributes (
- attribute_id serial PRIMARY KEY, -- Attribute type 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 DEFAULT 10 -- If set, minimum (least powerful) role that can set or change this attribute
slice_attribute_id serial PRIMARY KEY, -- Slice attribute identifier
slice_id integer REFERENCES slices NOT NULL, -- Slice identifier
node_id integer REFERENCES nodes, -- Sliver attribute if set
- attribute_id integer REFERENCES attributes NOT NULL, -- Attribute identifier
+ attribute_type_id integer REFERENCES slice_attribute_types NOT NULL, -- Attribute type identifier
value text
) WITH OIDS;
-CREATE INDEX slice_attribute_slice_id_key ON slice_attribute (slice_id);
-CREATE INDEX slice_attribute_node_id_key ON slice_attribute (node_id);
+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,
FROM slice_attribute
GROUP BY slice_id;
--- Node attributes
-CREATE TABLE node_attribute (
- node_attribute_id serial PRIMARY KEY, -- Node attribute identifier
- node_id integer REFERENCES nodes NOT NULL, -- Node identifier
- attribute_id integer REFERENCES attributes NOT NULL, -- Attribute identifier
- value text
+--------------------------------------------------------------------------------
+-- Events
+--------------------------------------------------------------------------------
+
+-- event types
+CREATE TABLE event_types (
+ event_type text PRIMARY KEY -- Event type
+
) WITH OIDS;
-CREATE INDEX node_attribute_node_id_key ON node_attribute (node_id);
-CREATE VIEW node_attributes AS
-SELECT node_id,
-array_to_string(array_accum(node_attribute_id), ',') AS node_attribute_ids
-FROM node_attribute
-GROUP BY node_id;
+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
+CREATE TABLE object_types (
+ 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 ('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 ('Unknown');
+
+-- 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
+
+) WITH OIDS;
+
+-- 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_to_string(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.event_type,
+events.object_type,
+events.fault_code,
+events.call,
+events.runtime,
+events.time
+From events
+LEFT JOIN event_objects USING (event_id);
+
+-- view_persons
CREATE VIEW view_persons AS
SELECT
persons.person_id,
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_slices.slice_ids,
+node_pcus.pcu_ids,
+node_pcus.ports,
+node_conf_files.conf_file_ids
FROM nodes
LEFT JOIN node_nodenetworks USING (node_id)
LEFT JOIN node_nodegroups USING (node_id)
-LEFT JOIN node_slices USING (node_id);
-
-CREATE VIEW view_node_attributes AS
-SELECT
-node_attribute.node_attribute_id,
-node_attribute.node_id,
-attributes.attribute_id,
-attributes.name,
-attributes.description,
-attributes.min_role_id,
-node_attribute.value
-FROM node_attribute
-INNER JOIN attributes USING (attribute_id);
+LEFT JOIN node_slices USING (node_id)
+LEFT JOIN node_pcus USING (node_id)
+LEFT JOIN node_conf_files USING (node_id);
CREATE VIEW view_nodegroups AS
SELECT
nodegroups.nodegroup_id,
nodegroups.name,
nodegroups.description,
-nodegroup_nodes.node_ids
+nodegroup_nodes.node_ids,
+nodegroup_conf_files.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,
+conf_file_nodes.node_ids,
+conf_file_nodegroups.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
+pcus.pcu_id,
+pcus.site_id,
+pcus.hostname,
+pcus.ip,
+pcus.protocol,
+pcus.username,
+pcus.password,
+pcus.model,
+pcus.notes,
+pcu_nodes.node_ids,
+pcu_nodes.ports
+FROM pcus
+LEFT JOIN pcu_nodes USING (pcu_id);
CREATE VIEW view_sites AS
SELECT
site_persons.person_ids,
site_nodes.node_ids,
site_addresses.address_ids,
-site_slices.slice_ids
+site_slices.slice_ids,
+site_pcus.pcu_ids
FROM sites
LEFT JOIN site_persons USING (site_id)
LEFT JOIN site_nodes USING (site_id)
LEFT JOIN site_addresses USING (site_id)
-LEFT JOIN site_slices USING (site_id);
+LEFT JOIN site_slices USING (site_id)
+LEFT JOIN site_pcus USING (site_id);
CREATE VIEW view_addresses AS
SELECT
addresses.address_id,
-addresses.address_type,
+addresses.site_id,
addresses.line1,
addresses.line2,
addresses.line3,
addresses.state,
addresses.postalcode,
addresses.country,
-site_address.site_id
+address_address_types.address_type_ids,
+address_address_types.address_types
FROM addresses
-LEFT JOIN site_address USING (address_id);
+LEFT JOIN address_address_types USING (address_id);
CREATE VIEW view_slices AS
SELECT
slice_attribute.slice_attribute_id,
slice_attribute.slice_id,
slice_attribute.node_id,
-attributes.attribute_id,
-attributes.name,
-attributes.description,
-attributes.min_role_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 attributes USING (attribute_id);
+INNER JOIN slice_attribute_types USING (attribute_type_id);
--------------------------------------------------------------------------------
-- Built-in maintenance account and default site