--
-- Copyright (C) 2006 The Trustees of Princeton University
--
--- $Id: planetlab4.sql,v 1.2 2006/09/25 18:34:48 mlhuang Exp $
+-- $Id: planetlab4.sql,v 1.12 2006/10/16 21:57:17 mlhuang Exp $
--
--------------------------------------------------------------------------------
-- 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
-- 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
-- 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
+);
+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
state text NOT NULL, -- State or province
postalcode text NOT NULL, -- Postal code
country text NOT NULL -- Country
-);
-
--- Site mailing addresses
-CREATE TABLE site_address (
- site_id integer REFERENCES sites, -- Account identifier
- address_id integer REFERENCES addresses, -- 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;
+
+-- 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
+) WITH OIDS;
+
+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;
--------------------------------------------------------------------------------
-- 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
+ person_id integer REFERENCES persons NOT NULL, -- Account identifier
+ key_id integer REFERENCES keys NOT NULL, -- Key identifier
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);
+) WITH OIDS;
+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,
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 (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
-- 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');
-- 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
-- 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);
+) 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
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
CREATE VIEW nodegroup_nodes AS
--------------------------------------------------------------------------------
-- 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');
+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
-);
-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
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
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
--------------------------------------------------------------------------------
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
-- 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
max_nodes integer NOT NULL DEFAULT 100, -- Maximum number of nodes that can be assigned to this slice
- creator_person_id integer REFERENCES persons, -- Creator
+ creator_person_id integer REFERENCES persons NOT NULL, -- Creator
created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, -- Creation date
expires timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP + '2 weeks', -- Expiration date
is_deleted boolean NOT NULL DEFAULT false
-);
-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
+) 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
-- 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
GROUP BY person_id;
--------------------------------------------------------------------------------
--- Slice attributes
+-- 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
+ 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 VIEW slice_attributes AS
SELECT slice_id,
-array_to_string(array_accum(attribute_id), ',') AS attribute_ids
+array_to_string(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
+--------------------------------------------------------------------------------
+-- 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 ('Get');
+INSERT INTO event_types (event_type) VALUES ('Update');
+INSERT INTO event_types (event_type) VALUES ('Delete');
+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 ('Person');
+INSERT INTO object_types (object_type) VALUES ('Site');
+INSERT INTO object_types (object_type) VALUES ('Node');
+INSERT INTO object_types (object_type) VALUES ('Slice');
+INSERT INTO object_types (object_type) VALUES ('Address');
+INSERT INTO object_types (object_type) VALUES ('Attribute');
+INSERT INTO object_types (object_type) VALUES ('Key');
+INSERT INTO object_types (object_type) VALUES ('Nodegroup');
+INSERT INTO object_types (object_type) VALUES ('Unknown');
+
+-- fault types
+CREATE TABLE fault_types (
+ fault_code integer PRIMARY KEY, -- Fault identifier
+ fault_type text UNIQUE NOT NULL -- Fault type
+
+) WITH OIDS;
+
+INSERT INTO fault_types (fault_code, fault_type) VALUES (0, 'Success');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (100, 'PLCInvalidAPIMethod');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (101, 'PLCInvalidArgumentCount');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (102, 'PLCInvalidArgument');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (103, 'PLCAuthenticationFailure');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (109, 'PLCNotImplemented');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (106, 'PLCDBError');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (108, 'PLCPermissionDenied');
+INSERT INTO fault_types (fault_code, fault_type) VALUES (111, 'PLCAPIError');
+
+
+-- events
+CREATE TABLE events (
+ event_id serial PRIMARY KEY, -- Event identifier
+ person_id integer REFERENCES persons NOT NULL, -- person responsible for event
+ event_type text REFERENCES event_types NOT NULL DEFAULT 'Unknown', -- Event type
+ object_type text REFERENCES object_types NOT NULL DEFAULT 'Unknown', -- Object type associated with event
+ fault_code integer REFERENCES fault_types NOT NULL DEFAULT 0, -- did this event result in error
+ call text NOT NULL, -- Call name
+
+ -- Optional
+ runtime float, -- Event run time
+
+ -- Timestamps
+ time timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP
+
+) WITH OIDS;
+
+-- event objects
+CREATE TABLE event_objects (
+ event_id integer REFERENCES events NOT NULL, -- Event identifier
+ object_id integer NOT NULL -- Object identifier
+
+) WITH OIDS;
--------------------------------------------------------------------------------
-- Useful views
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
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_slices USING (node_id)
+LEFT JOIN node_pcus USING (node_id);
CREATE VIEW view_nodegroups AS
SELECT
FROM nodegroups
LEFT JOIN nodegroup_nodes USING (nodegroup_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
sites.site_id,
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
CAST(date_part('epoch', slices.expires) AS bigint) AS expires,
slice_nodes.node_ids,
slice_persons.person_ids,
-slice_attributes.attribute_ids
+slice_attributes.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,
+slice_attribute.slice_id,
+slice_attribute.node_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);
+
--------------------------------------------------------------------------------
-- Built-in maintenance account and default site
--------------------------------------------------------------------------------