From 85145f48b98d75f460381d663cc211b7e70a68fb Mon Sep 17 00:00:00 2001 From: Adriaan Renting <renting@astron.nl> Date: Thu, 5 Nov 2015 14:02:29 +0000 Subject: [PATCH] Task #8580: updated the Resource Allocation Database scripts to include a fill script and fix an omission --- .gitattributes | 1 + .../sql/create_database.sql | 9 +++++++++ .../sql/fill_database.sql | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql diff --git a/.gitattributes b/.gitattributes index eb9e440a5be..04a7243e805 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4817,6 +4817,7 @@ SAS/OTDB/test/tBrokenHardware.cc -text SAS/OTDB/test/tMetadata.cc -text SAS/OTDB/test/tQueryPIC.cc -text SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql -text +SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql -text SAS/Scheduler/src/.default_settings.set -text SAS/Scheduler/src/LOFAR_libScheduler.pro -text SAS/Scheduler/src/conflictdialog.ui -text diff --git a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql index e1f06b90757..bbdea8513dd 100644 --- a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql +++ b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/create_database.sql @@ -122,6 +122,15 @@ CREATE TABLE task ( ALTER TABLE task OWNER TO renting; +DROP TABLE IF EXISTS task_status; +CREATE TABLE task_status ( + id serial NOT NULL, + name text NOT NULL, + PRIMARY KEY (id) +) WITH (OIDS=FALSE); +ALTER TABLE task_status + OWNER TO renting; + DROP TABLE IF EXISTS task_type; CREATE TABLE task_type ( id serial NOT NULL, diff --git a/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql new file mode 100644 index 00000000000..7a98afc9b49 --- /dev/null +++ b/SAS/ResourceAssignment/ResourceAllocationDatabase/sql/fill_database.sql @@ -0,0 +1,19 @@ +BEGIN; +INSERT INTO resource VALUES (0, 'CS001', 0), (1,'CS002', 0), (2, 'cep4_storage', 1); +INSERT INTO resource_type VALUES (0, 'station', 0),(1, 'storage', 1); +INSERT INTO unit VALUES (0, 'station'),(1, 'bytes'); +INSERT INTO resource_to_resource_group VALUES (0, 0, 0),(1, 1, 0), (2, 2, 1); +INSERT INTO resource_group VALUES (0, 'CORE', 0),(1, 'CEP4', 1); +INSERT INTO resource_group_type VALUES (0, 'stations'),(1, 'cluster'); +INSERT INTO resource_group_to_resource_group VALUES (0, 0, NULL),(1, 1, NULL); +INSERT INTO resource_claim VALUES (0, 0, 0, '2015-11-05 12:00:00', '2015-11-05 12:30:00', 0, '2015-11-06 12:00:00', 1), +(1, 2, 1, '2015-11-05 13:00:00', '2015-11-05 14:00:00', 1, '2015-11-06 12:00:00', 1234); +INSERT INTO resource_claim_status VALUES (0, 'CLAIMED'),(1, 'ALLOCATED'); +INSERT INTO task VALUES (0, 654321, 12345, 0, 0, 0),(1, 765432, 2654321, 1, 1, 1); +INSERT INTO task_status VALUES (0, 'SCHEDULED'),(1, 'CONFLICT'); +INSERT INTO task_type VALUES (0, 'OBSERVATION'),(1, 'PIPELINE'); +INSERT INTO specification VALUES (0, 'key=value'),(1, 'key=1'); +INSERT INTO resource_capacity VALUES (0, 0, 1, 1), (1, 1, 1,1 ), (2, 2, 15000, 100000); +INSERT INTO resource_availability VALUES (0, 0, TRUE), (1, 1, TRUE), (2, 2, TRUE); +INSERT INTO resource_group_availability VALUES (0, 0, TRUE), (1, 1, TRUE); +COMMIT; -- GitLab