diff --git a/docker-compose/timescaledb/Dockerfile b/docker-compose/timescaledb/Dockerfile
index 21385d861d35d7cf486fdd2dc9c6c01eeffff99c..5a8ecde23c3d69b9b665ac28dea3d5d7d5714ffd 100644
--- a/docker-compose/timescaledb/Dockerfile
+++ b/docker-compose/timescaledb/Dockerfile
@@ -5,4 +5,5 @@ COPY resources/01_admin.sql docker-entrypoint-initdb.d/002_admin.sql
COPY resources/02_hdb_schema.sql docker-entrypoint-initdb.d/003_hdb_schema.sql
COPY resources/03_hdb_roles.sql docker-entrypoint-initdb.d/004_hdb_roles.sql
COPY resources/04_hdb_ext_aggregates.sql docker-entrypoint-initdb.d/005_hdb_ext_aggregates.sql
-COPY resources/05_cleanup.sql docker-entrypoint-initdb.d/006_cleanup.sql
+COPY resources/05_lofar_views.sql docker-entrypoint-initdb.d/006_lofar_views.sql
+COPY resources/06_cleanup.sql docker-entrypoint-initdb.d/007_cleanup.sql
diff --git a/docker-compose/timescaledb/README.md b/docker-compose/timescaledb/README.md
index fbf3e2052a63689781586d1bc5f87bf75d875c15..75f9446ef254658f8282bcf6255c87aa0f39a94b 100644
--- a/docker-compose/timescaledb/README.md
+++ b/docker-compose/timescaledb/README.md
@@ -16,8 +16,3 @@ The next ones have been pulled from the official Tango repository in order to cr
- hdb_ext_aggregates.sql creates the continuous aggregate views (https://docs.timescale.com/timescaledb/latest/how-to-guides/continuous-aggregates/)
- cleanup.sql strips the SUPERUSER trait from hdb_admin
Last updates on these scripts are dated to August 2021 (more info can be found at https://github.com/tango-controls-hdbpp/hdbpp-timescale-project/blob/master/doc/db-schema-config.md)
-
-There is an older version of these Tango-Archiving generating scripts in the directory 'resources_v2'. These files have been pulled from Tango-LibHdbpp-Timescale (https://github.com/tango-controls-hdbpp/libhdbpp-timescale/tree/master/db-schema)
-
-
-
diff --git a/docker-compose/timescaledb/resources/05_lofar_views.sql b/docker-compose/timescaledb/resources/05_lofar_views.sql
new file mode 100644
index 0000000000000000000000000000000000000000..82aa8e5de360b434ecf081d1b02c000dff5d50f7
--- /dev/null
+++ b/docker-compose/timescaledb/resources/05_lofar_views.sql
@@ -0,0 +1,54 @@
+-- LOFAR 2.0 CUSTOMIZED VIEWS
+
+\c hdb
+-- SDP FPGA Temperature
+create or replace view "sdp_fpga_temp" as
+select
+ ac.att_name as "attribute",
+ aad.data_time AS "time",
+ aad.value_r
+FROM att_array_devdouble aad join att_conf ac
+on aad.att_conf_id = ac.att_conf_id
+where aad.value_R is not null
+and ac."domain" ='stat' and ac."family" ='sdp' and ac."member" ='1'
+ORDER BY aad.data_time;
+
+-- SDP FPGA Mask
+create or replace view "sdp_tr_fpga_mask" as
+select
+ ac.att_name as "attribute",
+ aab.data_time AS "time",
+ aab.value_r
+FROM att_array_devboolean aab join att_conf ac
+on aab.att_conf_id = ac.att_conf_id
+where aab.value_R is not null
+and ac."domain" ='stat' and ac."family" ='sdp' and ac."member" ='1'
+ORDER BY aab.data_time;
+
+-- SDP Masked values (rounded to 1 second)
+create or replace view "sdp_masked_temp_values" as
+select time_bucket('1 second',t.time) as "temp_time",
+time_bucket('1 second',m.time) as "mask_time",
+t.value_r as "temperature",
+m.value_r as "mask"
+from sdp_fpga_temp as t
+inner join sdp_tr_fpga_mask as m
+on time_bucket('1 second',t.time) = time_bucket('1 second',m.time)
+/* Replace if possible with SQL loop */
+where m.value_r[1]=true and
+m.value_r[2]=true and
+m.value_r[3]=true and
+m.value_r[4]=true and
+m.value_r[5]=true and
+m.value_r[6]=true and
+m.value_r[7]=true and
+m.value_r[8]=true and
+m.value_r[9]=true and
+m.value_r[10]=true and
+m.value_r[11]=true and
+m.value_r[12]=true and
+m.value_r[13]=true and
+m.value_r[14]=true and
+m.value_r[15]=true and
+m.value_r[16]=true
+order by t."time" ;
diff --git a/docker-compose/timescaledb/resources/05_cleanup.sql b/docker-compose/timescaledb/resources/06_cleanup.sql
similarity index 100%
rename from docker-compose/timescaledb/resources/05_cleanup.sql
rename to docker-compose/timescaledb/resources/06_cleanup.sql
diff --git a/docker-compose/timescaledb/resources_v2/cluster.sql b/docker-compose/timescaledb/resources_v2/cluster.sql
deleted file mode 100644
index 47394df44c31698a5aa80c5404d4d024cdcbab86..0000000000000000000000000000000000000000
--- a/docker-compose/timescaledb/resources_v2/cluster.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-ALTER TABLE att_scalar_devboolean CLUSTER ON att_scalar_devboolean_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devboolean CLUSTER ON att_array_devboolean_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devuchar CLUSTER ON att_scalar_devuchar_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devuchar CLUSTER ON att_array_devuchar_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devshort CLUSTER ON att_scalar_devshort_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devshort CLUSTER ON att_array_devshort_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devushort CLUSTER ON att_scalar_devushort_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devushort CLUSTER ON att_array_devushort_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devlong CLUSTER ON att_scalar_devlong_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devlong CLUSTER ON att_array_devlong_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devulong CLUSTER ON att_scalar_devulong_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devulong CLUSTER ON att_array_devulong_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devlong64 CLUSTER ON att_scalar_devlong64_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devlong64 CLUSTER ON att_array_devlong64_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devulong64 CLUSTER ON att_scalar_devulong64_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devulong64 CLUSTER ON att_array_devulong64_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devfloat CLUSTER ON att_scalar_devfloat_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devfloat CLUSTER ON att_array_devfloat_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devdouble CLUSTER ON att_scalar_devdouble_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devdouble CLUSTER ON att_array_devdouble_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devstring CLUSTER ON att_scalar_devstring_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devstring CLUSTER ON att_array_devstring_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devstate CLUSTER ON att_scalar_devstate_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devstate CLUSTER ON att_array_devstate_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devencoded CLUSTER ON att_scalar_devencoded_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devencoded CLUSTER ON att_array_devencoded_att_conf_id_data_time_idx;
-ALTER TABLE att_scalar_devenum CLUSTER ON att_scalar_devenum_att_conf_id_data_time_idx;
-ALTER TABLE att_array_devenum CLUSTER ON att_array_devenum_att_conf_id_data_time_idx;
-
-CLUSTER att_scalar_devboolean;
-CLUSTER att_array_devboolean;
-CLUSTER att_scalar_devuchar;
-CLUSTER att_array_devuchar;
-CLUSTER att_scalar_devshort;
-CLUSTER att_array_devshort;
-CLUSTER att_scalar_devushort;
-CLUSTER att_array_devushort;
-CLUSTER att_scalar_devlong;
-CLUSTER att_array_devlong;
-CLUSTER att_scalar_devulong;
-CLUSTER att_array_devulong;
-CLUSTER att_scalar_devlong64;
-CLUSTER att_array_devlong64;
-CLUSTER att_scalar_devulong64;
-CLUSTER att_array_devulong64;
-CLUSTER att_scalar_devfloat;
-CLUSTER att_array_devfloat;
-CLUSTER att_scalar_devdouble;
-CLUSTER att_array_devdouble;
-CLUSTER att_scalar_devstring;
-CLUSTER att_array_devstring;
-CLUSTER att_scalar_devstate;
-CLUSTER att_array_devstate;
-CLUSTER att_scalar_devencoded;
-CLUSTER att_array_devencoded;
-CLUSTER att_scalar_devenum;
-CLUSTER att_array_devenum;
diff --git a/docker-compose/timescaledb/resources_v2/schema.sql b/docker-compose/timescaledb/resources_v2/schema.sql
deleted file mode 100644
index c44f05f64970df0f5aabebc14c76075eb1bef757..0000000000000000000000000000000000000000
--- a/docker-compose/timescaledb/resources_v2/schema.sql
+++ /dev/null
@@ -1,665 +0,0 @@
-DROP DATABASE IF EXISTS hdb;
-
--- Create the hdb database and use it
-CREATE DATABASE hdb;
-\c hdb
-
--- Add the timescaledb extension (Important)
-CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;
-
--------------------------------------------------------------------------------
-CREATE DOMAIN uchar AS numeric(3) -- ALT smallint
- CHECK(VALUE >= 0 AND VALUE <= 255);
-
-CREATE DOMAIN ushort AS numeric(5) -- ALT integer
- CHECK(VALUE >= 0 AND VALUE <= 65535);
-
-CREATE DOMAIN ulong AS numeric(10) -- ALT bigint
- CHECK(VALUE >= 0 AND VALUE <= 4294967295);
-
-CREATE DOMAIN ulong64 AS numeric(20)
- CHECK(VALUE >= 0 AND VALUE <= 18446744073709551615);
-
--------------------------------------------------------------------------------
-DROP TABLE IF EXISTS att_conf_type;
-
--- Mappings for ths Tango Data Type (used in att_conf)
-CREATE TABLE att_conf_type (
- att_conf_type_id serial NOT NULL,
- type text NOT NULL,
- type_num smallint NOT NULL,
- PRIMARY KEY (att_conf_type_id)
-);
-
-COMMENT ON TABLE att_conf_type is 'Attribute data type';
-
-INSERT INTO att_conf_type (type, type_num) VALUES
-('DEV_BOOLEAN', 1),('DEV_SHORT', 2),('DEV_LONG', 3),('DEV_FLOAT', 4),
-('DEV_DOUBLE', 5),('DEV_USHORT', 6),('DEV_ULONG', 7),('DEV_STRING', 8),
-('DEV_STATE', 19),('DEV_UCHAR',22),('DEV_LONG64', 23),('DEV_ULONG64', 24),
-('DEV_ENCODED', 28),('DEV_ENUM', 29);
-
-DROP TABLE IF EXISTS att_conf_format;
-
--- Mappings for ths Tango Data Format Type (used in att_conf)
-CREATE TABLE att_conf_format (
- att_conf_format_id serial NOT NULL,
- format text NOT NULL,
- format_num smallint NOT NULL,
- PRIMARY KEY (att_conf_format_id)
-);
-
-COMMENT ON TABLE att_conf_format is 'Attribute format type';
-
-INSERT INTO att_conf_format (format, format_num) VALUES
-('SCALAR', 0),('SPECTRUM', 1),('IMAGE', 2);
-
-DROP TABLE IF EXISTS att_conf_write;
-
--- Mappings for the Tango Data Write Type (used in att_conf)
-CREATE TABLE att_conf_write (
- att_conf_write_id serial NOT NULL,
- write text NOT NULL,
- write_num smallint NOT NULL,
- PRIMARY KEY (att_conf_write_id)
-);
-
-COMMENT ON TABLE att_conf_write is 'Attribute write type';
-
-INSERT INTO att_conf_write (write, write_num) VALUES
-('READ', 0),('READ_WITH_WRITE', 1),('WRITE', 2),('READ_WRITE', 3);
-
--- The att_conf table contains the primary key for all data tables, the
--- att_conf_id. Expanded on the normal hdb++ tables since we add information
--- about the type.
-CREATE TABLE IF NOT EXISTS att_conf (
- att_conf_id serial NOT NULL,
- att_name text NOT NULL,
- att_conf_type_id smallint NOT NULL,
- att_conf_format_id smallint NOT NULL,
- att_conf_write_id smallint NOT NULL,
- table_name text NOT NULL,
- cs_name text NOT NULL DEFAULT '',
- domain text NOT NULL DEFAULT '',
- family text NOT NULL DEFAULT '',
- member text NOT NULL DEFAULT '',
- name text NOT NULL DEFAULT '',
- ttl int,
- hide boolean DEFAULT false,
- PRIMARY KEY (att_conf_id),
- FOREIGN KEY (att_conf_type_id) REFERENCES att_conf_type (att_conf_type_id),
- FOREIGN KEY (att_conf_format_id) REFERENCES att_conf_format (att_conf_format_id),
- FOREIGN KEY (att_conf_write_id) REFERENCES att_conf_write (att_conf_write_id),
- UNIQUE (att_name)
-);
-
-COMMENT ON TABLE att_conf is 'Attribute Configuration Table';
-CREATE INDEX IF NOT EXISTS att_conf_att_conf_id_idx ON att_conf (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_conf_att_conf_type_id_idx ON att_conf (att_conf_type_id);
-
--------------------------------------------------------------------------------
-DROP TABLE IF EXISTS att_history_event;
-
-CREATE TABLE att_history_event (
- att_history_event_id serial NOT NULL,
- event text NOT NULL,
- PRIMARY KEY (att_history_event_id)
-);
-
-COMMENT ON TABLE att_history_event IS 'Attribute history events description';
-CREATE INDEX IF NOT EXISTS att_history_att_history_event_id_idx ON att_history_event (att_history_event_id);
-
-CREATE TABLE IF NOT EXISTS att_history (
- att_conf_id integer NOT NULL,
- att_history_event_id integer NOT NULL,
- event_time timestamp WITH TIME ZONE,
- details json,
- PRIMARY KEY (att_conf_id, event_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_history_event_id) REFERENCES att_history_event (att_history_event_id)
-);
-
-COMMENT ON TABLE att_history is 'Attribute Configuration Events History Table';
-CREATE INDEX IF NOT EXISTS att_history_att_conf_id_inx ON att_history (att_conf_id);
-
--------------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS att_parameter (
- att_conf_id integer NOT NULL,
- recv_time timestamp WITH TIME ZONE NOT NULL,
- label text NOT NULL DEFAULT '',
- unit text NOT NULL DEFAULT '',
- standard_unit text NOT NULL DEFAULT '',
- display_unit text NOT NULL DEFAULT '',
- format text NOT NULL DEFAULT '',
- archive_rel_change text NOT NULL DEFAULT '',
- archive_abs_change text NOT NULL DEFAULT '',
- archive_period text NOT NULL DEFAULT '',
- description text NOT NULL DEFAULT '',
- details json,
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id)
-);
-
-COMMENT ON TABLE att_parameter IS 'Attribute configuration parameters';
-CREATE INDEX IF NOT EXISTS att_parameter_recv_time_idx ON att_parameter (recv_time);
-CREATE INDEX IF NOT EXISTS att_parameter_att_conf_id_idx ON att_parameter (att_conf_id);
-SELECT create_hypertable('att_parameter', 'recv_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
--------------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS att_error_desc (
- att_error_desc_id serial NOT NULL,
- error_desc text NOT NULL,
- PRIMARY KEY (att_error_desc_id),
- UNIQUE (error_desc)
-);
-
-COMMENT ON TABLE att_error_desc IS 'Error Description Table';
-CREATE INDEX IF NOT EXISTS att_error_desc_att_error_desc_id_idx ON att_error_desc (att_error_desc_id);
-
--------------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS att_scalar_devboolean (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r boolean,
- value_w boolean,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devboolean IS 'Scalar Boolean Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devboolean_att_conf_id_idx ON att_scalar_devboolean (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devboolean_att_conf_id_data_time_idx ON att_scalar_devboolean (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devboolean', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devboolean (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r boolean[],
- value_w boolean[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devboolean IS 'Array Boolean Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devboolean_att_conf_id_idx ON att_array_devboolean (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devboolean_att_conf_id_data_time_idx ON att_array_devboolean (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devboolean', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devuchar (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r uchar,
- value_w uchar,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devuchar IS 'Scalar UChar Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devuchar_att_conf_id_idx ON att_scalar_devuchar (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devuchar_att_conf_id_data_time_idx ON att_scalar_devuchar (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devuchar', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devuchar (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r uchar[],
- value_w uchar[],
- quality smallint,
- details json,
- att_error_desc_id integer,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devuchar IS 'Array UChar Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devuchar_att_conf_id_idx ON att_array_devuchar (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devuchar_att_conf_id_data_time_idx ON att_array_devuchar (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devuchar', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devshort (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r smallint,
- value_w smallint,
- quality smallint,
- details json,
- att_error_desc_id integer,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devshort IS 'Scalar Short Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devshort_att_conf_id_idx ON att_scalar_devshort (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devshort_att_conf_id_data_time_idx ON att_scalar_devshort (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devshort', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devshort (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r smallint[],
- value_w smallint[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devshort IS 'Array Short Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devshort_att_conf_id_idx ON att_array_devshort (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devshort_att_conf_id_data_time_idx ON att_array_devshort (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devshort', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devushort (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r ushort,
- value_w ushort,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devushort IS 'Scalar UShort Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devushort_att_conf_id_idx ON att_scalar_devushort (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devushort_att_conf_id_data_time_idx ON att_scalar_devushort (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devushort', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devushort (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r ushort[],
- value_w ushort[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devushort IS 'Array UShort Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devushort_att_conf_id_idx ON att_array_devushort (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devushort_att_conf_id_data_time_idx ON att_array_devushort (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devushort', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devlong (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r integer,
- value_w integer,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devlong IS 'Scalar Long Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devlong_att_conf_id_idx ON att_scalar_devlong (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devlong_att_conf_id_data_time_idx ON att_scalar_devlong (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devlong', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devlong (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r integer[],
- value_w integer[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devlong IS 'Array Long Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devlong_att_conf_id_idx ON att_array_devlong (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devlong_att_conf_id_data_time_idx ON att_array_devlong (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devlong', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devulong (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r ulong,
- value_w ulong,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devulong IS 'Scalar ULong Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devulong_att_conf_id_idx ON att_scalar_devulong (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devulong_att_conf_id_data_time_idx ON att_scalar_devulong (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devulong', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devulong (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r ulong[],
- value_w ulong[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devulong IS 'Array ULong Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devulong_att_conf_id_idx ON att_array_devulong (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devulong_att_conf_id_data_time_idx ON att_array_devulong (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devulong', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devlong64 (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r bigint,
- value_w bigint,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devlong64 IS 'Scalar Long64 Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devlong64_att_conf_id_idx ON att_scalar_devlong64 (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devlong64_att_conf_id_data_time_idx ON att_scalar_devlong64 (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devlong64', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devlong64 (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r bigint[],
- value_w bigint[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devlong64 IS 'Array Long64 Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devlong64_att_conf_id_idx ON att_array_devlong64 (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devlong64_att_conf_id_data_time_idx ON att_array_devlong64 (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devlong64', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devulong64 (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r ulong64,
- value_w ulong64,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devulong64 IS 'Scalar ULong64 Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devulong64_att_conf_id_idx ON att_scalar_devulong64 (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devulong64_att_conf_id_data_time_idx ON att_scalar_devulong64 (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devulong64', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devulong64 (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r ulong64[],
- value_w ulong64[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devulong64 IS 'Array ULong64 Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devulong64_att_conf_id_idx ON att_array_devulong64 (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devulong64_att_conf_id_data_time_idx ON att_array_devulong64 (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devulong64', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devfloat (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r real,
- value_w real,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devfloat IS 'Scalar Float Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devfloat_att_conf_id_idx ON att_scalar_devfloat (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devfloat_att_conf_id_data_time_idx ON att_scalar_devfloat (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devfloat', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devfloat (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r real[],
- value_w real[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devfloat IS 'Array Float Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devfloat_att_conf_id_idx ON att_array_devfloat (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devfloat_att_conf_id_data_time_idx ON att_array_devfloat (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devfloat', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devdouble (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r double precision,
- value_w double precision,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devdouble IS 'Scalar Double Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devdouble_att_conf_id_idx ON att_scalar_devdouble (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devdouble_att_conf_id_data_time_idx ON att_scalar_devdouble (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devdouble', 'data_time', chunk_time_interval => interval '14 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devdouble (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r double precision[],
- value_w double precision[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devdouble IS 'Array Double Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devdouble_att_conf_id_idx ON att_array_devdouble (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devdouble_att_conf_id_data_time_idx ON att_array_devdouble (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devdouble', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devstring (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r text,
- value_w text,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devstring IS 'Scalar String Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devstring_att_conf_id_idx ON att_scalar_devstring (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devstring_att_conf_id_data_time_idx ON att_scalar_devstring (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devstring', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devstring (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r text[],
- value_w text[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devstring IS 'Array String Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devstring_att_conf_id_idx ON att_array_devstring (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devstring_att_conf_id_data_time_idx ON att_array_devstring (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devstring', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devstate (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r integer,
- value_w integer,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devstate IS 'Scalar State Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devstate_att_conf_id_idx ON att_scalar_devstate (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devstate_att_conf_id_data_time_idx ON att_scalar_devstate (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devstate', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devstate (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r integer[],
- value_w integer[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devstate IS 'Array State Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devstate_att_conf_id_idx ON att_array_devstate (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devstate_att_conf_id_data_time_idx ON att_array_devstate (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devstate', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_scalar_devencoded (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r bytea,
- value_w bytea,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-COMMENT ON TABLE att_scalar_devencoded IS 'Scalar DevEncoded Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devencoded_att_conf_id_idx ON att_scalar_devencoded (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devencoded_att_conf_id_data_time_idx ON att_scalar_devencoded (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devencoded', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devencoded (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r bytea[],
- value_w bytea[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-COMMENT ON TABLE att_array_devencoded IS 'Array DevEncoded Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devencoded_att_conf_id_idx ON att_array_devencoded (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devencoded_att_conf_id_data_time_idx ON att_array_devencoded (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devencoded', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
--- The Enum tables are unique in that they store a value and text label for
--- each data point
-CREATE TABLE IF NOT EXISTS att_scalar_devenum (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r_label text,
- value_r smallint,
- value_w_label text,
- value_w smallint,
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_scalar_devenum IS 'Scalar Enum Values Table';
-CREATE INDEX IF NOT EXISTS att_scalar_devenum_att_conf_id_idx ON att_scalar_devenum (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_scalar_devenum_att_conf_id_data_time_idx ON att_scalar_devenum (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_scalar_devenum', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
-
-CREATE TABLE IF NOT EXISTS att_array_devenum (
- att_conf_id integer NOT NULL,
- data_time timestamp WITH TIME ZONE NOT NULL,
- value_r_label text[],
- value_r smallint[],
- value_w_label text[],
- value_w smallint[],
- quality smallint,
- att_error_desc_id integer,
- details json,
- PRIMARY KEY (att_conf_id, data_time),
- FOREIGN KEY (att_conf_id) REFERENCES att_conf (att_conf_id),
- FOREIGN KEY (att_error_desc_id) REFERENCES att_error_desc (att_error_desc_id)
-);
-
-COMMENT ON TABLE att_array_devenum IS 'Array Enum Values Table';
-CREATE INDEX IF NOT EXISTS att_array_devenum_att_conf_id_idx ON att_array_devenum (att_conf_id);
-CREATE INDEX IF NOT EXISTS att_array_devenum_att_conf_id_data_time_idx ON att_array_devenum (att_conf_id,data_time DESC);
-SELECT create_hypertable('att_array_devenum', 'data_time', chunk_time_interval => interval '28 day', create_default_indexes => FALSE);
diff --git a/docker-compose/timescaledb/resources_v2/users.sql b/docker-compose/timescaledb/resources_v2/users.sql
deleted file mode 100644
index c4dc62f6183a7a0c1762c5b423eef096374624a9..0000000000000000000000000000000000000000
--- a/docker-compose/timescaledb/resources_v2/users.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- Roles
-CREATE ROLE readonly;
-CREATE ROLE readwrite;
-
--- Permissions - readonly
-GRANT CONNECT ON DATABASE hdb TO readonly;
-GRANT USAGE ON SCHEMA public TO readonly;
-GRANT SELECT ON ALL TABLES IN SCHEMA public TO readonly;
-ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO readonly;
-
--- Permissions - readwrite
-GRANT CONNECT ON DATABASE hdb TO readwrite;
-GRANT USAGE ON SCHEMA public TO readwrite;
-GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO readwrite;
-ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO readwrite;
-GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO readwrite;
-ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT USAGE ON SEQUENCES TO readwrite;
-GRANT ALL ON SCHEMA public TO readwrite;
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO readwrite;
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO readwrite;
-
--- Users
-CREATE ROLE hdb_cfg_man WITH LOGIN PASSWORD 'hdbpp';
-GRANT readwrite TO hdb_cfg_man;
-
-CREATE ROLE hdb_event_sub WITH LOGIN PASSWORD 'hdbpp';
-GRANT readwrite TO hdb_event_sub;
-
-CREATE ROLE hdb_java_reporter WITH LOGIN PASSWORD 'hdbpp';
-GRANT readonly TO hdb_java_reporter;
diff --git a/jupyter-notebooks/test_template.ipynb b/jupyter-notebooks/test_template.ipynb
new file mode 100644
index 0000000000000000000000000000000000000000..9d3553517b38f2a6ebdd1f54dc8cb5a461de4909
--- /dev/null
+++ b/jupyter-notebooks/test_template.ipynb
@@ -0,0 +1,328 @@
+{
+ "cells": [
+ {
+ "cell_type": "markdown",
+ "id": "6bdc7054",
+ "metadata": {},
+ "source": [
+ "# Test LRx.y: Test Name\n",
+ "\n",
+ "This notebook documents test output.\n",
+ "\n",
+ "Instructions:\n",
+ "\n",
+ "1. *PRESS File -> Make a Copy*,\n",
+ "1. Rename the notebook to the name of the test,\n",
+ "1. Update the title at the top of this section,\n",
+ "1. Fill in the sections with empty blocks with code and text,\n",
+ "1. Execute the provided initialisation code,\n",
+ "1. Run the tests,\n",
+ "1. *Rerun everything top to bottom to make sure the notebook is correct*,\n",
+ "1. Fill in the results & verdict.\n",
+ "1. Export the Jupyter Notebook to PDF and upload the file to the Polarion test results page.\n",
+ "1. ...and you're done!"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "63785004",
+ "metadata": {},
+ "source": [
+ "## Author\n",
+ "Descibe who ran this test, and who helped (if applicable):"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "3c720d4b",
+ "metadata": {},
+ "source": [
+ "(your name)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "ff837bcb",
+ "metadata": {},
+ "source": [
+ "## Timestamp\n",
+ "\n",
+ "This test was executed at:"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "00418ee4",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# Run this code\n",
+ "import datetime\n",
+ "print(f\"Test was executed at {datetime.datetime.isoformat(datetime.datetime.now(), ' ')}\")"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "0b4a59a5",
+ "metadata": {},
+ "source": [
+ "## Purpose\n",
+ "\n",
+ "Describe the purpose and context of this notebook, possibly including any links to external references, e.g. the Polarion reference number:"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "09d4d0a1",
+ "metadata": {},
+ "source": [
+ "(purpose)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "4c6489f3",
+ "metadata": {},
+ "source": [
+ "## Methodology\n",
+ "\n",
+ "Provide a summary of how we are going to prove compliance:"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "ceae21d4",
+ "metadata": {},
+ "source": [
+ "(methodology)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "9033f262",
+ "metadata": {},
+ "source": [
+ "## Initialisation\n",
+ "\n",
+ "The following sections contain boilerplate code to get the station to a well-defined state. If this is not applicable or broken, just note that here:"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "00d4e336",
+ "metadata": {},
+ "source": []
+ },
+ {
+ "cell_type": "markdown",
+ "id": "7532d05e",
+ "metadata": {},
+ "source": [
+ "### Hot reboot\n",
+ "\n",
+ "Makes sure the software and hardware are all in a known state."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 1,
+ "id": "c7a3effa",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# Restart boot device\n",
+ "boot.off()\n",
+ "boot.initialise()\n",
+ "boot.on()"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 2,
+ "id": "b4dd21b1",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# Reboot the station\n",
+ "boot.boot()"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 4,
+ "id": "78a4db84",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# Wait for reboot to complete\n",
+ "import time\n",
+ "while boot.booting_R:\n",
+ " time.sleep(2)\n",
+ " print(f\"Initialisation at {boot.progress_R}%: {boot.status_R}\")\n",
+ " \n",
+ "assert boot.progress_R == 100, f\"Failed to fully initialise station: {boot.status_R}\"\n",
+ "if boot.uninitialised_devices_R:\n",
+ " print(f\"Warning! Did not initialise {boot.uninitialised_devices_R}. This might be inconsequential for this test.\")"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "9bc072af",
+ "metadata": {},
+ "source": [
+ "### Active versions\n",
+ "\n",
+ "List the versions currently running on the station."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "35b815d4",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "def summarise(l: list) -> list:\n",
+ " return [f\"{idx}: {version}\" for idx,version in enumerate(l) if version] or [\"no versions reported\"]\n",
+ "\n",
+ "versions = {\n",
+ " \"SC\": {dev.name():dev.version_R for dev in devices},\n",
+ " \"SDP\": {\n",
+ " \"FPGA firmware\": summarise(sdp.FPGA_firmware_version_R),\n",
+ " \"FPGA hardware\": summarise(sdp.FPGA_hardware_version_R),\n",
+ " \"SDPTR\": sdp.TR_software_version_R,\n",
+ " },\n",
+ " \"RECV\": {\n",
+ " \"PCB\": summarise(recv.RCU_PCB_version_R),\n",
+ " },\n",
+ " \"APSCT\": {\n",
+ " \"PCB\": apsct.APSCT_PCB_version_R,\n",
+ " },\n",
+ " \"APSPU\": {\n",
+ " \"PCB\": apspu.APSPU_PCB_version_R,\n",
+ " },\n",
+ " \"UNB2\": {\n",
+ " \"PCB\": summarise(unb2.UNB2_PCB_version_R),\n",
+ " }\n",
+ "}\n",
+ "\n",
+ "from pprint import pprint\n",
+ "pprint(versions, width=120)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "e51a06b7",
+ "metadata": {},
+ "source": [
+ "## Test setup\n",
+ "\n",
+ "Setup the hardware for the test:"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "e72dc2df",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# Your code to configure the station for this test"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "772dff7c",
+ "metadata": {},
+ "source": [
+ "## Run test"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "26570aea",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# Your code that triggers the actual test (if this is an explicit step)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "6c604116",
+ "metadata": {},
+ "source": [
+ "## Test results"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "d290d8dd",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# plot sst in after "
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "d3cdb620",
+ "metadata": {},
+ "source": [
+ "## Discuss results\n",
+ "\n",
+ "How should the results be interpreted? Are there remaining worries and todo's based on this result?"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "6e082c7c",
+ "metadata": {},
+ "source": [
+ "(Explain results, and caveats)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "a95fbf48",
+ "metadata": {},
+ "source": [
+ "## Verdict\n",
+ "\n",
+ "The test passed/did not pass:"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "9a2a7a97",
+ "metadata": {},
+ "source": [
+ "(Explain whether the result is good enough, or what needs to be done to improve)"
+ ]
+ }
+ ],
+ "metadata": {
+ "kernelspec": {
+ "display_name": "StationControl",
+ "language": "python",
+ "name": "stationcontrol"
+ },
+ "language_info": {
+ "codemirror_mode": {
+ "name": "ipython",
+ "version": 3
+ },
+ "file_extension": ".py",
+ "mimetype": "text/x-python",
+ "name": "python",
+ "nbconvert_exporter": "python",
+ "pygments_lexer": "ipython3",
+ "version": "3.7.3"
+ }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/tangostationcontrol/tangostationcontrol/clients/opcua_client.py b/tangostationcontrol/tangostationcontrol/clients/opcua_client.py
index ce4447de3b9c8339bd36cc1e75a04ec6867b04de..f0c246a691ea163a7549715bee5d15393cc6674d 100644
--- a/tangostationcontrol/tangostationcontrol/clients/opcua_client.py
+++ b/tangostationcontrol/tangostationcontrol/clients/opcua_client.py
@@ -58,6 +58,9 @@ class OPCUAConnection(AsyncCommClient):
# prefix path to all nodes with this. this allows the user to switch trees more easily.
self.node_path_prefix = []
+ # cache of looked up child node lists for each comma-separated parent path
+ self._node_cache = {}
+
super().__init__(fault_func, event_loop)
def _servername(self):
@@ -130,13 +133,41 @@ class OPCUAConnection(AsyncCommClient):
return path
+ async def get_node(self, path):
+ """ Retrieve an OPC-UA node from either the cache, or the server. """
+
+ if not path:
+ return self.obj
+
+ cache_key = ",".join(path)
+
+ # lookup in cache
+ if cache_key in self._node_cache:
+ return self._node_cache[cache_key]
+
+ # cache it and all of its siblings to save us the round trips for them later on.
+ parent_path = path[:-1]
+ parent_node = await self.obj.get_child(parent_path) if parent_path else self.obj
+ child_nodes = await parent_node.get_children_descriptions()
+
+ for child_node in child_nodes:
+ # add node to the cache
+ child_path = parent_path + [f"{self.name_space_index}:{child_node.DisplayName.Text}"]
+ self._node_cache[",".join(child_path)] = self.client.get_node(child_node.NodeId)
+
+ # lookup in cache again. if the name is valid, it should be in there.
+ if cache_key in self._node_cache:
+ return self._node_cache[cache_key]
+
+ # we couldnt find the requested child, ask server directly to get the appropriate error
+ return await self.obj.get_child(path)
async def setup_protocol_attribute(self, annotation, attribute):
# process the annotation
path = self.get_node_path(annotation)
try:
- node = await self.obj.get_child(path)
+ node = await self.get_node(path)
except Exception as e:
logger.exception("Could not get node: %s on server %s", path, self._servername())
raise Exception("Could not get node: %s on server %s", path, self._servername()) from e
@@ -180,7 +211,7 @@ class OPCUAConnection(AsyncCommClient):
try:
# call method in its parent node
- node = await self.obj.get_child(method_path[:-1]) if len(method_path) > 1 else self.obj
+ node = await self.get_node(method_path[:-1])
result = await node.call_method(method_path[-1], *args)
except Exception as e:
raise Exception(f"Calling method {method_path} failed") from e
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/test_opcua_client.py b/tangostationcontrol/tangostationcontrol/test/clients/test_opcua_client.py
index c1c29ee04279bab3c943ccc35d4e3a5071345607..25968deded93d8d45160c5a1949521784ab59e7a 100644
--- a/tangostationcontrol/tangostationcontrol/test/clients/test_opcua_client.py
+++ b/tangostationcontrol/tangostationcontrol/test/clients/test_opcua_client.py
@@ -86,6 +86,7 @@ class TestOPCua(base.AsyncTestCase):
m_opc_client_members.send_hello = asynctest.asynctest.CoroutineMock()
m_objects_node = asynctest.Mock()
m_objects_node.get_child = asynctest.asynctest.CoroutineMock()
+ m_objects_node.get_children_descriptions = asynctest.asynctest.CoroutineMock()
m_opc_client_members.get_objects_node = asynctest.Mock(return_value=m_objects_node)
m_opc_client.return_value = m_opc_client_members
@@ -108,7 +109,7 @@ class TestOPCua(base.AsyncTestCase):
m_attribute = mock_attr(i.numpy_type, dim_x, dim_y)
# pretend like there is a running OPCua server with a node that has this name
- m_annotation = ["2:PCC", f"2:testNode_{str(i.numpy_type)}_{str(dim_x)}_{str(dim_y)}"]
+ m_annotation = [f"2:testNode_{str(i.numpy_type)}_{str(dim_x)}_{str(dim_y)}"]
test_client = OPCUAConnection("opc.tcp://localhost:4874/freeopcua/server/", "http://lofar.eu", 5, mock.Mock(), self.loop)
try: