Eli Mesika has uploaded a new change for review.
Change subject: core: db sqush 3.2 upgrade scripts
......................................................................
core: db sqush 3.2 upgrade scripts
This patch squashes all 03_02_* upgrade scripts into the main database
creation scripts.
1) Creating a git branch and removing all upgrade scripts except
those with 03_02_*
2) Creating a new 3_2 database based on 1)
3) Using pg_dump to export 3_2 schema & data
4) Replacing the create_tables.sql with the schema file generated on 3)
5) Editing manually insert_data.sql and insert_predefined_roles.sql
to have all changes from data exported at step 3)
6) Creating a database engine_db_squash_3_2 on this patch branch
7) Creating a database engine_master on the master branch
8) Use pg_dump to export db from step 6) schema & data
9) Use pg_dump to export db from step 7) schema & data
10)Compare schema & data from steps 8) & 9)
Change-Id: I1ce390403c6133b66726089ff3b1e0c91ec4a2c8
Signed-off-by: Eli Mesika <[email protected]>
---
M packaging/dbscripts/common_sp.sql
M packaging/dbscripts/create_functions.sql
M packaging/dbscripts/create_tables.sql
M packaging/dbscripts/dbfunc-common.sh
M packaging/dbscripts/insert_data.sql
M packaging/dbscripts/insert_predefined_roles.sql
D packaging/dbscripts/upgrade/03_02_0010_delete_action_version_map.sql
D packaging/dbscripts/upgrade/03_02_0020_add_libvirt_version_col.sql
D packaging/dbscripts/upgrade/03_02_0030_delete_permissions_on_vnic.sql
D packaging/dbscripts/upgrade/03_02_0040_add_permissions_on_networks.sql
D packaging/dbscripts/upgrade/03_02_0050_add_vm_guest_agent_interfaces_table.sql
D packaging/dbscripts/upgrade/03_02_0060_change_host_to_server_event_map.sql
D packaging/dbscripts/upgrade/03_02_0070_ha_vm_event_notifications.sql
D
packaging/dbscripts/upgrade/03_02_0080_add_user_vm_manager_to_vm_power_users.sql
D packaging/dbscripts/upgrade/03_02_0090_cpuhost_support.sql
D packaging/dbscripts/upgrade/03_02_0100_add_cpu_thread_columns.sql
D packaging/dbscripts/upgrade/03_02_0110_add_nic_hash_column_to_vm_dynamic.sql
D
packaging/dbscripts/upgrade/03_02_0120_add_index_to_vm_guest_agent_interfaces.sql
D packaging/dbscripts/upgrade/03_02_0130_add_linked_to_vm_interface.sql
D
packaging/dbscripts/upgrade/03_02_0140_allow_null_network_name_in_vm_interfaces.sql
D packaging/dbscripts/upgrade/03_02_0150_add_console_cur_user_name.sql
D packaging/dbscripts/upgrade/03_02_0160_drop_guest_user_id_column.sql
D packaging/dbscripts/upgrade/03_02_0170_add_admin_internal_user_role_system.sql
D packaging/dbscripts/upgrade/03_02_0180_add_pm_proxy_preferences.sql
D packaging/dbscripts/upgrade/03_02_0190_add_vds_hardware_info.sql
D packaging/dbscripts/upgrade/03_02_0200_add_vm_generation_columns.sql
D packaging/dbscripts/upgrade/03_02_0210_add_external_events.sql
D packaging/dbscripts/upgrade/03_02_0220_add_pm_multi_agent_support.sql
D packaging/dbscripts/upgrade/03_02_0230_extend_lun_size.sql
D packaging/dbscripts/upgrade/03_02_0240_add_gluster_action_version_map.sql
D packaging/dbscripts/upgrade/03_02_0250_delete_actiongroups_uservmmanager.sql
D packaging/dbscripts/upgrade/03_02_0260_add_delete_protection.sql
D
packaging/dbscripts/upgrade/03_02_0270_gluster_volume_name_unique_constraint.sql
D packaging/dbscripts/upgrade/03_02_0280_drop_licenses.sql
D
packaging/dbscripts/upgrade/03_02_0290_change_vm_guest_agent_interface_mac_address_type.sql
D packaging/dbscripts/upgrade/03_02_0300_add_quota_consume_action_group_link.sql
D packaging/dbscripts/upgrade/03_02_0310_add_disabled_to_vm_static.sql
D
packaging/dbscripts/upgrade/03_02_0320_fix_principal_name_in_users_for_ad_users.sql
D packaging/dbscripts/upgrade/03_02_0330_add_vds_event_notifications.sql
D packaging/dbscripts/upgrade/03_02_0340_gluster_volume_status_events.sql
D packaging/dbscripts/upgrade/03_02_0350_add_console_address.sql
D packaging/dbscripts/upgrade/03_02_0360_add_secondary_index_to_network.sql
D packaging/dbscripts/upgrade/03_02_0370_add_vds_performance_notifications.sql
D packaging/dbscripts/upgrade/03_02_0380_gluster_option_changed_event.sql
D packaging/dbscripts/upgrade/03_02_0390_align_lun_volume_group_id.sql
D
packaging/dbscripts/upgrade/03_02_0400_add_login_permission_to_network_user_role.sql
D packaging/dbscripts/upgrade/03_02_0410_remove_user_session.sql
D packaging/dbscripts/upgrade/03_02_0420_materialized_views_extensions.sql
D packaging/dbscripts/upgrade/03_02_0430_dummy.sql
D packaging/dbscripts/upgrade/03_02_0440_dummy.sql
D packaging/dbscripts/upgrade/03_02_0450_dummy.sql
D packaging/dbscripts/upgrade/03_02_0460_add_async_task_task_parameters.sql
D packaging/dbscripts/upgrade/03_02_0470_lsm_version_support.sql
D packaging/dbscripts/upgrade/03_02_0480_fix_stateless_snapshot.sql
D
packaging/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql
D packaging/dbscripts/upgrade/03_02_0500_add_gluster_hooks_table.sql
R packaging/dbscripts/upgrade/03_03_0000_set_version.sql
M packaging/dbscripts/upgrade/03_03_0450_add_external_tasks_support.sql
58 files changed, 532 insertions(+), 624 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/30899/1
diff --git a/packaging/dbscripts/common_sp.sql
b/packaging/dbscripts/common_sp.sql
index aa14456..1b380f4 100644
--- a/packaging/dbscripts/common_sp.sql
+++ b/packaging/dbscripts/common_sp.sql
@@ -507,7 +507,12 @@
DROP TYPE IF EXISTS async_tasks_info_rs CASCADE;
CREATE TYPE async_tasks_info_rs AS (
- dc_id UUID, dc_name CHARACTER VARYING, spm_host_id UUID, spm_host_name
CHARACTER VARYING, task_count integer);
+ dc_id uuid,
+ dc_name character varying,
+ spm_host_id uuid,
+ spm_host_name character varying,
+ task_count integer
+);
create or replace FUNCTION fn_db_get_async_tasks()
diff --git a/packaging/dbscripts/create_functions.sql
b/packaging/dbscripts/create_functions.sql
index 7205d79..9ccb3a0 100644
--- a/packaging/dbscripts/create_functions.sql
+++ b/packaging/dbscripts/create_functions.sql
@@ -5,13 +5,26 @@
----------------------------------
DROP TYPE IF EXISTS idTextType CASCADE;
+CREATE TYPE idtexttype AS (
+ id text
+);
+
DROP TYPE IF EXISTS idUuidType CASCADE;
+CREATE TYPE iduuidtype AS (
+ id uuid
+);
+
DROP TYPE IF EXISTS booleanResultType CASCADE;
-CREATE TYPE idTextType AS(id text);
-CREATE TYPE idUuidType AS(id UUID);
-CREATE TYPE booleanResultType AS(result BOOLEAN);
+CREATE TYPE booleanresulttype AS (
+ result boolean
+);
+
DROP TYPE IF EXISTS authzEntryInfoType CASCADE;
-CREATE TYPE authzEntryInfoType AS(name text, namespace VARCHAR(2048), authz
VARCHAR(255));
+CREATE TYPE authzentryinfotype AS (
+ name text,
+ namespace character varying(2048),
+ authz character varying(255)
+);
CREATE OR REPLACE FUNCTION getGlobalIds(v_name VARCHAR(4000))
@@ -68,7 +81,12 @@
--All permissions of current user (include groups)
DROP TYPE IF EXISTS user_permissions CASCADE;
-CREATE TYPE user_permissions AS(permission_id UUID, role_id UUID, user_id
UUID);
+CREATE TYPE user_permissions AS (
+ permission_id uuid,
+ role_id uuid,
+ user_id uuid
+);
+
CREATE OR REPLACE FUNCTION public.fn_user_permissions(v_userId IN uuid)
RETURNS SETOF user_permissions STABLE AS
$function$
DECLARE
@@ -627,8 +645,10 @@
-- Quota Functions ----
-----------------------
DROP TYPE IF EXISTS vds_group_usage_rs CASCADE;
-CREATE TYPE vds_group_usage_rs AS
- ( virtual_cpu_usage INTEGER,mem_size_mb_usage BIGINT);
+CREATE TYPE vds_group_usage_rs AS (
+ virtual_cpu_usage integer,
+ mem_size_mb_usage bigint
+);
-- returns a set of integers representing vm statuses on which the vm shouldn't
-- be used for quota calculation
@@ -661,9 +681,16 @@
DROP TYPE IF EXISTS all_vds_group_usage_rs CASCADE;
-CREATE TYPE all_vds_group_usage_rs AS
- (quota_vds_group_id UUID, quota_id UUID,vds_group_id UUID,vds_group_name
character varying(40),virtual_cpu INTEGER,virtual_cpu_usage INTEGER,mem_size_mb
BIGINT,mem_size_mb_usage BIGINT);
-
+CREATE TYPE all_vds_group_usage_rs AS (
+ quota_vds_group_id uuid,
+ quota_id uuid,
+ vds_group_id uuid,
+ vds_group_name character varying(40),
+ virtual_cpu integer,
+ virtual_cpu_usage integer,
+ mem_size_mb bigint,
+ mem_size_mb_usage bigint
+);
-- Summarize the VCPU usage and the RAM usage for all the VMs in the quota
which are not down or suspended
-- If vds group id is null, then returns the global usage of the quota,
otherwise returns only the sum of all VMs in the specific cluster.
@@ -695,9 +722,14 @@
DROP TYPE IF EXISTS all_storage_usage_rs CASCADE;
-CREATE TYPE all_storage_usage_rs AS
- (quota_storage_id UUID,quota_id UUID,storage_id UUID,storage_name
character varying(250),storage_size_gb BIGINT,storage_size_gb_usage double
precision);
-
+CREATE TYPE all_storage_usage_rs AS (
+ quota_storage_id uuid,
+ quota_id uuid,
+ storage_id uuid,
+ storage_name character varying(250),
+ storage_size_gb bigint,
+ storage_size_gb_usage double precision
+);
CREATE OR REPLACE FUNCTION calculateAllStorageUsage()
RETURNS SETOF all_storage_usage_rs STABLE
diff --git a/packaging/dbscripts/create_tables.sql
b/packaging/dbscripts/create_tables.sql
index e525e62..28a6870 100644
--- a/packaging/dbscripts/create_tables.sql
+++ b/packaging/dbscripts/create_tables.sql
@@ -1,4 +1,3 @@
-
--
-- Name: action_version_map; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -8,7 +7,6 @@
cluster_minimal_version character varying(40) NOT NULL,
storage_pool_minimal_version character varying(40) NOT NULL
);
-
--
@@ -22,7 +20,6 @@
domain character varying(100),
distinguishedname character varying(4000) DEFAULT NULL::character varying
);
-
--
@@ -40,9 +37,10 @@
command_id uuid NOT NULL,
started_at timestamp with time zone,
storage_pool_id uuid,
- task_type integer DEFAULT 0 NOT NULL
+ task_type integer DEFAULT 0 NOT NULL,
+ task_parameters text,
+ task_params_class character varying(256)
);
-
--
@@ -56,11 +54,12 @@
);
-
--
-- Name: audit_log; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
+
CREATE SEQUENCE audit_log_seq INCREMENT BY 1 START WITH 1;
+
CREATE TABLE audit_log (
audit_log_id bigint DEFAULT nextval('audit_log_seq'::regclass) NOT NULL,
user_id uuid,
@@ -88,9 +87,13 @@
quota_id uuid,
quota_name character varying(60),
gluster_volume_id uuid,
- gluster_volume_name character varying(1000)
+ gluster_volume_name character varying(1000),
+ origin character varying(255) DEFAULT 'oVirt'::character varying,
+ custom_event_id integer DEFAULT (-1),
+ event_flood_in_sec integer DEFAULT 30,
+ custom_data text DEFAULT ''::text,
+ deleted boolean DEFAULT false
);
-
--
@@ -109,7 +112,6 @@
);
-
--
-- Name: bookmarks; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -119,7 +121,6 @@
bookmark_name character varying(40),
bookmark_value character varying(300) NOT NULL
);
-
--
@@ -143,7 +144,9 @@
--
-- Name: custom_actions; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
+
CREATE SEQUENCE custom_actions_seq INCREMENT BY 1 START WITH 1;
+
CREATE TABLE custom_actions (
action_id integer DEFAULT nextval('custom_actions_seq'::regclass) NOT NULL,
action_name character varying(50) NOT NULL,
@@ -151,7 +154,6 @@
tab integer NOT NULL,
description character varying(4000)
);
-
--
@@ -165,10 +167,9 @@
actual_size bigint NOT NULL,
read_latency_seconds numeric(18,9),
write_latency_seconds numeric(18,9),
- flush_latency_seconds numeric(18,9)
+ flush_latency_seconds numeric(18,9),
+ _update_date timestamp with time zone
);
-
-
--
@@ -179,8 +180,6 @@
disk_id uuid NOT NULL,
lun_id character varying NOT NULL
);
-
-
--
@@ -194,7 +193,6 @@
);
-
--
-- Name: event_map; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -203,7 +201,6 @@
event_up_name character varying(100) NOT NULL,
event_down_name character varying(100) NOT NULL
);
-
--
@@ -221,7 +218,6 @@
);
-
--
-- Name: event_notification_methods; Type: TABLE; Schema: public; Owner:
engine; Tablespace:
--
@@ -230,7 +226,6 @@
method_id integer NOT NULL,
method_type character(10) NOT NULL
);
-
--
@@ -246,6 +241,40 @@
);
+--
+-- Name: gluster_hooks; Type: TABLE; Schema: public; Owner: engine; Tablespace:
+--
+
+CREATE TABLE gluster_hooks (
+ id uuid NOT NULL,
+ cluster_id uuid NOT NULL,
+ gluster_command character varying(128) NOT NULL,
+ stage character varying(50) NOT NULL,
+ name character varying(256) NOT NULL,
+ hook_status character varying(50),
+ content_type character varying(50),
+ checksum character varying(256),
+ content text,
+ conflict_status integer DEFAULT 0 NOT NULL,
+ _create_date timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone NOT NULL,
+ _update_date timestamp with time zone
+);
+
+
+--
+-- Name: gluster_server_hooks; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
+--
+
+CREATE TABLE gluster_server_hooks (
+ hook_id uuid NOT NULL,
+ server_id uuid NOT NULL,
+ hook_status character varying(50),
+ content_type character varying(50),
+ checksum character varying(256),
+ _create_date timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone NOT NULL,
+ _update_date timestamp with time zone
+);
+
--
-- Name: gluster_volume_access_protocols; Type: TABLE; Schema: public; Owner:
engine; Tablespace:
@@ -255,7 +284,6 @@
volume_id uuid NOT NULL,
access_protocol character varying(32) NOT NULL
);
-
--
@@ -274,7 +302,6 @@
);
-
--
-- Name: gluster_volume_options; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -287,7 +314,6 @@
);
-
--
-- Name: gluster_volume_transport_types; Type: TABLE; Schema: public; Owner:
engine; Tablespace:
--
@@ -296,7 +322,6 @@
volume_id uuid NOT NULL,
transport_type character varying(32) NOT NULL
);
-
--
@@ -316,7 +341,6 @@
);
-
--
-- Name: image_storage_domain_map; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -325,7 +349,6 @@
image_id uuid NOT NULL,
storage_domain_id uuid NOT NULL
);
-
--
@@ -351,7 +374,6 @@
);
-
--
-- Name: job; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -370,7 +392,6 @@
);
-
--
-- Name: job_subject_entity; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -382,16 +403,14 @@
);
-
--
-- Name: lun_storage_server_connection_map; Type: TABLE; Schema: public;
Owner: engine; Tablespace:
--
CREATE TABLE lun_storage_server_connection_map (
- lun_id character varying(50) NOT NULL,
+ lun_id character varying(255) NOT NULL,
storage_server_connection character varying(50) NOT NULL
);
-
--
@@ -400,8 +419,8 @@
CREATE TABLE luns (
physical_volume_id character varying(50),
- lun_id character varying(50) NOT NULL,
- volume_group_id character varying(50),
+ lun_id character varying(255) NOT NULL,
+ volume_group_id character varying(50) NOT NULL,
serial character varying(4000),
lun_mapping integer,
vendor_id character varying(50),
@@ -409,6 +428,21 @@
device_size integer DEFAULT 0
);
+
+--
+-- Name: materialized_views; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
+--
+
+CREATE TABLE materialized_views (
+ mv_name name NOT NULL,
+ v_name name NOT NULL,
+ refresh_rate_in_sec integer,
+ last_refresh timestamp with time zone,
+ avg_cost_ms integer DEFAULT 0 NOT NULL,
+ min_refresh_rate_in_sec integer DEFAULT 0,
+ custom boolean DEFAULT false,
+ active boolean DEFAULT true
+);
--
@@ -431,7 +465,6 @@
);
-
--
-- Name: network_cluster; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -445,7 +478,6 @@
);
-
--
-- Name: permissions; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -457,7 +489,6 @@
object_id uuid NOT NULL,
object_type_id integer NOT NULL
);
-
--
@@ -478,7 +509,6 @@
);
-
--
-- Name: quota_limitation; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -492,7 +522,6 @@
mem_size_mb bigint,
storage_size_gb bigint
);
-
--
@@ -509,7 +538,6 @@
);
-
--
-- Name: roles; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -524,7 +552,6 @@
);
-
--
-- Name: roles_groups; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -533,7 +560,6 @@
role_id uuid NOT NULL,
action_group_id integer NOT NULL
);
-
--
@@ -546,24 +572,24 @@
);
-
--
-- Name: schema_version; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
+
CREATE SEQUENCE schema_version_seq INCREMENT BY 1 START WITH 1;
+
CREATE TABLE schema_version (
id integer DEFAULT nextval('schema_version_seq'::regclass) NOT NULL,
version character varying(10) NOT NULL,
script character varying(255) NOT NULL,
checksum character varying(128),
- installed_by character varying(30) NOT NULL,
+ installed_by character varying(63) NOT NULL,
started_at timestamp without time zone DEFAULT now(),
ended_at timestamp without time zone,
state character varying(15) NOT NULL,
current boolean NOT NULL,
comment text DEFAULT ''::text
);
-
--
@@ -582,7 +608,6 @@
_create_date timestamp with time zone DEFAULT now(),
_update_date timestamp with time zone
);
-
--
@@ -605,7 +630,6 @@
);
-
--
-- Name: storage_domain_dynamic; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -613,9 +637,9 @@
CREATE TABLE storage_domain_dynamic (
id uuid NOT NULL,
available_disk_size integer,
- used_disk_size integer
+ used_disk_size integer,
+ _update_date timestamp with time zone
);
-
--
@@ -634,7 +658,6 @@
recoverable boolean DEFAULT true NOT NULL,
last_time_used_as_master bigint
);
-
--
@@ -657,7 +680,6 @@
);
-
--
-- Name: storage_pool_iso_map; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -668,7 +690,6 @@
status integer,
owner integer
);
-
--
@@ -692,7 +713,6 @@
);
-
--
-- Name: tags; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -709,7 +729,6 @@
);
-
--
-- Name: tags_user_group_map; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -719,7 +738,6 @@
group_id uuid NOT NULL,
_create_date timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone
);
-
--
@@ -733,7 +751,6 @@
);
-
--
-- Name: tags_vds_map; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -743,7 +760,6 @@
vds_id uuid NOT NULL,
_create_date timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone
);
-
--
@@ -758,7 +774,6 @@
);
-
--
-- Name: tags_vm_pool_map; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -768,22 +783,6 @@
vm_pool_id uuid NOT NULL,
_create_date timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone
);
-
-
-
---
--- Name: user_sessions; Type: TABLE; Schema: public; Owner: engine; Tablespace:
---
-
-CREATE TABLE user_sessions (
- session_id character(32) NOT NULL,
- user_id uuid NOT NULL,
- os character(10),
- browser character(10),
- client_type character(10),
- login_time timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone
-);
-
--
@@ -810,11 +809,12 @@
);
-
--
-- Name: vdc_db_log; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
+
CREATE SEQUENCE vdc_db_log_seq INCREMENT BY 1 START WITH 1;
+
CREATE TABLE vdc_db_log (
error_id bigint DEFAULT nextval('vdc_db_log_seq'::regclass) NOT NULL,
occured_at timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone NOT NULL,
@@ -825,18 +825,18 @@
);
-
--
-- Name: vdc_options; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
+
CREATE SEQUENCE vdc_options_seq INCREMENT BY 1 START WITH 1;
+
CREATE TABLE vdc_options (
option_id integer DEFAULT nextval('vdc_options_seq'::regclass) NOT NULL,
option_name character varying(100) NOT NULL,
option_value character varying(4000) NOT NULL,
version character varying(40) DEFAULT 'general'::character varying NOT NULL
);
-
--
@@ -880,9 +880,17 @@
_update_date timestamp with time zone,
non_operational_reason integer DEFAULT 0 NOT NULL,
pending_vmem_size integer DEFAULT 0 NOT NULL,
- rpm_version character varying(256) DEFAULT NULL::character varying
+ rpm_version character varying(256) DEFAULT NULL::character varying,
+ supported_engines character varying(40),
+ libvirt_version character varying(256) DEFAULT NULL::character varying,
+ cpu_threads integer,
+ hw_manufacturer character varying(255),
+ hw_product_name character varying(255),
+ hw_version character varying(255),
+ hw_serial_number character varying(255),
+ hw_uuid character varying(255),
+ hw_family character varying(255)
);
-
--
@@ -906,9 +914,9 @@
transparent_hugepages boolean DEFAULT false NOT NULL,
migrate_on_error integer DEFAULT 1 NOT NULL,
virt_service boolean DEFAULT true NOT NULL,
- gluster_service boolean DEFAULT false NOT NULL
+ gluster_service boolean DEFAULT false NOT NULL,
+ count_threads_as_cores boolean DEFAULT false NOT NULL
);
-
--
@@ -939,7 +947,6 @@
);
-
--
-- Name: vds_interface_statistics; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
--
@@ -951,9 +958,9 @@
tx_rate numeric(18,0),
rx_drop numeric(18,0),
tx_drop numeric(18,0),
- iface_status integer
+ iface_status integer,
+ _update_date timestamp with time zone
);
-
--
@@ -965,7 +972,6 @@
vds_spm_id integer NOT NULL,
vds_id uuid NOT NULL
);
-
--
@@ -995,9 +1001,17 @@
vds_spm_priority smallint DEFAULT 5,
recoverable boolean DEFAULT true NOT NULL,
sshkeyfingerprint character varying(128),
+ pm_proxy_preferences character varying(255) DEFAULT ''::character varying,
+ pm_secondary_ip character varying(255),
+ pm_secondary_type character varying(20),
+ pm_secondary_user character varying(50),
+ pm_secondary_password text,
+ pm_secondary_port integer,
+ pm_secondary_options character varying(4000),
+ pm_secondary_concurrent boolean DEFAULT false,
+ console_address character varying(255) DEFAULT NULL::character varying,
CONSTRAINT vds_static_vds_spm_priority_check CHECK (((vds_spm_priority >=
(-1)) AND (vds_spm_priority <= 10)))
);
-
--
@@ -1019,9 +1033,9 @@
swap_total bigint,
ksm_cpu_percent integer DEFAULT 0,
ksm_pages bigint,
- ksm_state boolean
+ ksm_state boolean,
+ _update_date timestamp with time zone
);
-
--
@@ -1045,7 +1059,6 @@
);
-
--
-- Name: vm_dynamic; Type: TABLE; Schema: public; Owner: engine; Tablespace:
--
@@ -1058,7 +1071,6 @@
vm_pid integer,
last_start_time timestamp with time zone,
guest_cur_user_name character varying(255),
- guest_cur_user_id uuid,
guest_last_login_time timestamp with time zone,
guest_last_logout_time timestamp with time zone,
guest_os character varying(255),
@@ -1082,9 +1094,23 @@
pause_status integer DEFAULT 0 NOT NULL,
exit_message character varying(4000),
hash character varying(30),
- console_user_id uuid
+ console_user_id uuid,
+ guest_agent_nics_hash integer,
+ console_cur_user_name character varying(255)
);
+
+--
+-- Name: vm_guest_agent_interfaces; Type: TABLE; Schema: public; Owner:
engine; Tablespace:
+--
+
+CREATE TABLE vm_guest_agent_interfaces (
+ vm_id uuid NOT NULL,
+ interface_name text,
+ mac_address character varying(59),
+ ipv4_addresses text,
+ ipv6_addresses text
+);
--
@@ -1102,9 +1128,9 @@
type integer DEFAULT 0,
_create_date timestamp with time zone DEFAULT ('now'::text)::timestamp
without time zone,
_update_date timestamp with time zone,
- port_mirroring boolean DEFAULT false NOT NULL
+ port_mirroring boolean DEFAULT false NOT NULL,
+ linked boolean DEFAULT true NOT NULL
);
-
--
@@ -1118,9 +1144,20 @@
tx_rate numeric(18,0),
rx_drop numeric(18,0),
tx_drop numeric(18,0),
- iface_status integer
+ iface_status integer,
+ _update_date timestamp with time zone
);
+
+--
+-- Name: vm_ovf_generations; Type: TABLE; Schema: public; Owner: engine;
Tablespace:
+--
+
+CREATE TABLE vm_ovf_generations (
+ vm_guid uuid NOT NULL,
+ storage_pool_id uuid,
+ ovf_generation bigint DEFAULT 0
+);
--
@@ -1131,7 +1168,6 @@
vm_pool_id uuid,
vm_guid uuid NOT NULL
);
-
--
@@ -1147,7 +1183,6 @@
vds_group_id uuid,
prestarted_vms smallint DEFAULT 0
);
-
--
@@ -1197,9 +1232,12 @@
quota_id uuid,
allow_console_reconnect boolean DEFAULT false NOT NULL,
cpu_pinning character varying(4000) DEFAULT NULL::character varying,
- is_smartcard_enabled boolean DEFAULT false
+ is_smartcard_enabled boolean DEFAULT false,
+ host_cpu_flags boolean DEFAULT false,
+ db_generation bigint DEFAULT 1,
+ is_delete_protected boolean DEFAULT false,
+ is_disabled boolean DEFAULT false
);
-
--
@@ -1214,7 +1252,8 @@
usage_network_percent integer DEFAULT 0,
usage_mem_percent integer DEFAULT 0,
usage_cpu_percent integer DEFAULT 0,
- disks_usage text
+ disks_usage text,
+ _update_date timestamp with time zone
);
@@ -1224,6 +1263,14 @@
ALTER TABLE ONLY disk_lun_map
ADD CONSTRAINT disk_lun_map_pk PRIMARY KEY (disk_id, lun_id);
+
+
+--
+-- Name: gluster_volumes_name_unique; Type: CONSTRAINT; Schema: public; Owner:
engine; Tablespace:
+--
+
+ALTER TABLE ONLY gluster_volumes
+ ADD CONSTRAINT gluster_volumes_name_unique UNIQUE (cluster_id, vol_name);
--
@@ -1240,6 +1287,14 @@
ALTER TABLE ONLY gluster_volume_options
ADD CONSTRAINT idx_gluster_volume_options_volume_id_option_key UNIQUE
(volume_id, option_key);
+
+
+--
+-- Name: materialized_views_pkey; Type: CONSTRAINT; Schema: public; Owner:
engine; Tablespace:
+--
+
+ALTER TABLE ONLY materialized_views
+ ADD CONSTRAINT materialized_views_pkey PRIMARY KEY (mv_name);
--
@@ -1328,6 +1383,14 @@
ALTER TABLE ONLY event_subscriber
ADD CONSTRAINT pk_event_subscriber PRIMARY KEY (subscriber_id,
event_up_name, method_id, tag_name);
+
+
+--
+-- Name: pk_gluster_hooks; Type: CONSTRAINT; Schema: public; Owner: engine;
Tablespace:
+--
+
+ALTER TABLE ONLY gluster_hooks
+ ADD CONSTRAINT pk_gluster_hooks PRIMARY KEY (id);
--
@@ -1603,14 +1666,6 @@
--
--- Name: pk_user_sessions; Type: CONSTRAINT; Schema: public; Owner: engine;
Tablespace:
---
-
-ALTER TABLE ONLY user_sessions
- ADD CONSTRAINT pk_user_sessions PRIMARY KEY (user_id, session_id);
-
-
---
-- Name: pk_users; Type: CONSTRAINT; Schema: public; Owner: engine; Tablespace:
--
@@ -1794,6 +1849,20 @@
ADD CONSTRAINT vds_static_vds_name_unique UNIQUE (vds_name);
+--
+-- Name: vm_ovf_generations_pkey; Type: CONSTRAINT; Schema: public; Owner:
engine; Tablespace:
+--
+
+ALTER TABLE ONLY vm_ovf_generations
+ ADD CONSTRAINT vm_ovf_generations_pkey PRIMARY KEY (vm_guid);
+
+
+--
+-- Name: audit_log_origin_custom_event_id_idx; Type: INDEX; Schema: public;
Owner: engine; Tablespace:
+--
+
+CREATE UNIQUE INDEX audit_log_origin_custom_event_id_idx ON audit_log USING
btree (origin, custom_event_id) WHERE ((origin)::text !~~* 'ovirt'::text);
+
--
-- Name: idx_audit_correlation_id; Type: INDEX; Schema: public; Owner: engine;
Tablespace:
@@ -1873,6 +1942,27 @@
--
+-- Name: idx_gluster_hooks_cluster_id; Type: INDEX; Schema: public; Owner:
engine; Tablespace:
+--
+
+CREATE INDEX idx_gluster_hooks_cluster_id ON gluster_hooks USING btree
(cluster_id);
+
+
+--
+-- Name: idx_gluster_hooks_unique; Type: INDEX; Schema: public; Owner: engine;
Tablespace:
+--
+
+CREATE UNIQUE INDEX idx_gluster_hooks_unique ON gluster_hooks USING btree
(cluster_id, gluster_command, stage, name);
+
+
+--
+-- Name: idx_gluster_server_hooks_unique; Type: INDEX; Schema: public; Owner:
engine; Tablespace:
+--
+
+CREATE UNIQUE INDEX idx_gluster_server_hooks_unique ON gluster_server_hooks
USING btree (hook_id, server_id);
+
+
+--
-- Name: idx_gluster_volume_access_protocols_volume_id; Type: INDEX; Schema:
public; Owner: engine; Tablespace:
--
@@ -1908,17 +1998,17 @@
--
--- Name: idx_gluster_volumes_name_unique; Type: INDEX; Schema: public; Owner:
engine; Tablespace:
---
-
-CREATE INDEX idx_gluster_volumes_name_unique ON gluster_volumes USING btree
(cluster_id, vol_name);
-
-
---
-- Name: idx_job_subject_entity_entity_id; Type: INDEX; Schema: public; Owner:
engine; Tablespace:
--
CREATE INDEX idx_job_subject_entity_entity_id ON job_subject_entity USING
btree (entity_id);
+
+
+--
+-- Name: idx_network_storage_pool_id; Type: INDEX; Schema: public; Owner:
engine; Tablespace:
+--
+
+CREATE INDEX idx_network_storage_pool_id ON network USING btree
(storage_pool_id);
--
@@ -2013,10 +2103,31 @@
--
+-- Name: idx_vm_guest_agent_interfaces_vm_id; Type: INDEX; Schema: public;
Owner: engine; Tablespace:
+--
+
+CREATE INDEX idx_vm_guest_agent_interfaces_vm_id ON vm_guest_agent_interfaces
USING btree (vm_id);
+
+
+--
-- Name: idx_vm_interface_vm_vmt_guid; Type: INDEX; Schema: public; Owner:
engine; Tablespace:
--
CREATE INDEX idx_vm_interface_vm_vmt_guid ON vm_interface USING btree
(vm_guid, vmt_guid);
+
+
+--
+-- Name: idx_vm_ovf_generations_storage_pool_id; Type: INDEX; Schema: public;
Owner: engine; Tablespace:
+--
+
+CREATE INDEX idx_vm_ovf_generations_storage_pool_id ON vm_ovf_generations
USING btree (storage_pool_id);
+
+
+--
+-- Name: idx_vm_ovf_generations_vm_guid; Type: INDEX; Schema: public; Owner:
engine; Tablespace:
+--
+
+CREATE INDEX idx_vm_ovf_generations_vm_guid ON vm_ovf_generations USING btree
(vm_guid);
--
@@ -2031,6 +2142,7 @@
--
CREATE INDEX ix_vdc_options ON vdc_options USING btree (option_name);
+
--
-- Name: disk_lun_to_disk_fk; Type: FK CONSTRAINT; Schema: public; Owner:
engine
@@ -2265,14 +2377,6 @@
--
--- Name: fk_users; Type: FK CONSTRAINT; Schema: public; Owner: engine
---
-
-ALTER TABLE ONLY user_sessions
- ADD CONSTRAINT fk_users FOREIGN KEY (user_id) REFERENCES users(user_id) ON
DELETE CASCADE;
-
-
---
-- Name: fk_vds_groups_storage_pool_id; Type: FK CONSTRAINT; Schema: public;
Owner: engine
--
@@ -2337,6 +2441,14 @@
--
+-- Name: fk_vm_guest_agent_interfaces; Type: FK CONSTRAINT; Schema: public;
Owner: engine
+--
+
+ALTER TABLE ONLY vm_guest_agent_interfaces
+ ADD CONSTRAINT fk_vm_guest_agent_interfaces FOREIGN KEY (vm_id) REFERENCES
vm_static(vm_guid) ON DELETE CASCADE;
+
+
+--
-- Name: fk_vm_interface_statistics_vm_static; Type: FK CONSTRAINT; Schema:
public; Owner: engine
--
@@ -2358,6 +2470,30 @@
ALTER TABLE ONLY vm_interface
ADD CONSTRAINT fk_vm_interface_vm_static_template FOREIGN KEY (vmt_guid)
REFERENCES vm_static(vm_guid) ON DELETE CASCADE;
+
+
+--
+-- Name: gluster_hooks_cluster_id_fkey; Type: FK CONSTRAINT; Schema: public;
Owner: engine
+--
+
+ALTER TABLE ONLY gluster_hooks
+ ADD CONSTRAINT gluster_hooks_cluster_id_fkey FOREIGN KEY (cluster_id)
REFERENCES vds_groups(vds_group_id) ON DELETE CASCADE;
+
+
+--
+-- Name: gluster_server_hooks_hook_id_fkey; Type: FK CONSTRAINT; Schema:
public; Owner: engine
+--
+
+ALTER TABLE ONLY gluster_server_hooks
+ ADD CONSTRAINT gluster_server_hooks_hook_id_fkey FOREIGN KEY (hook_id)
REFERENCES gluster_hooks(id) ON DELETE CASCADE;
+
+
+--
+-- Name: gluster_server_hooks_server_id_fkey; Type: FK CONSTRAINT; Schema:
public; Owner: engine
+--
+
+ALTER TABLE ONLY gluster_server_hooks
+ ADD CONSTRAINT gluster_server_hooks_server_id_fkey FOREIGN KEY (server_id)
REFERENCES vds_static(vds_id) ON DELETE CASCADE;
--
@@ -2569,6 +2705,14 @@
--
+-- Name: vm_ovf_generations_storage_pool_id_fkey; Type: FK CONSTRAINT; Schema:
public; Owner: engine
+--
+
+ALTER TABLE ONLY vm_ovf_generations
+ ADD CONSTRAINT vm_ovf_generations_storage_pool_id_fkey FOREIGN KEY
(storage_pool_id) REFERENCES storage_pool(id) ON DELETE CASCADE;
+
+
+--
-- Name: vm_pools_vm; Type: FK CONSTRAINT; Schema: public; Owner: engine
--
@@ -2598,5 +2742,4 @@
ALTER TABLE ONLY vm_static
ADD CONSTRAINT vm_templates_vm_static FOREIGN KEY (vmt_guid) REFERENCES
vm_static(vm_guid);
-
diff --git a/packaging/dbscripts/dbfunc-common.sh
b/packaging/dbscripts/dbfunc-common.sh
index 56f92b3..fe23020 100644
--- a/packaging/dbscripts/dbfunc-common.sh
+++ b/packaging/dbscripts/dbfunc-common.sh
@@ -163,7 +163,7 @@
_dbfunc_common_schema_upgrade() {
- dbfunc_psql_die
--file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/upgrade/03_02_0000_set_version.sql" >
/dev/null
+ dbfunc_psql_die
--file="${DBFUNC_COMMON_DBSCRIPTS_DIR}/upgrade/03_03_0000_set_version.sql" >
/dev/null
local files="$(_dbfunc_common_get_files "upgrade" 1)"
if [ -n "${files}" ]; then
diff --git a/packaging/dbscripts/insert_data.sql
b/packaging/dbscripts/insert_data.sql
index 8e9d3be..32b0688 100644
--- a/packaging/dbscripts/insert_data.sql
+++ b/packaging/dbscripts/insert_data.sql
@@ -17,7 +17,7 @@
-- INSERT DATA to schema_version
INSERT INTO
schema_version(version,script,checksum,installed_by,ended_at,state,current)
- values
('03020000','upgrade/03_02_0000_set_version.sql','0','engine',now(),'INSTALLED',true);
+ values
('03020000','upgrade/03_03_0000_set_version.sql','0','engine',now(),'INSTALLED',true);
-- INSERT everyone TO ad_groups
INSERT into ad_groups (id,name,status,domain,distinguishedname)
@@ -90,8 +90,8 @@
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_REPLACE_BRICK_START_FAILED',
'GLUSTER_VOLUME_REPLACE_BRICK_START');
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_ADD_BRICK', 'UNASSIGNED');
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_ADD_BRICK_FAILED', 'GLUSTER_VOLUME_ADD_BRICK');
-INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_HOST_REMOVE_FAILED', 'UNASSIGNED');
-INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_HOST_ADD_FAILED', 'UNASSIGNED');
+INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_SERVER_REMOVE_FAILED', 'UNASSIGNED');
+INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_SERVER_ADD_FAILED', 'UNASSIGNED');
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_CREATED_FROM_CLI', 'UNASSIGNED');
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_DELETED_FROM_CLI', 'UNASSIGNED');
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_OPTION_SET_FROM_CLI', 'UNASSIGNED');
@@ -100,7 +100,21 @@
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_BRICK_ADDED_FROM_CLI', 'UNASSIGNED');
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_BRICK_REMOVED_FROM_CLI', 'UNASSIGNED');
INSERT INTO event_map(event_up_name, event_down_name)
values('GLUSTER_SERVER_REMOVED_FROM_CLI', 'UNASSIGNED');
-
+insert into event_map(event_up_name, event_down_name)
values('HA_VM_RESTART_FAILED', '');
+insert into event_map(event_up_name, event_down_name) values('HA_VM_FAILED',
'');
+insert into event_map(event_up_name, event_down_name)
values('SYSTEM_DEACTIVATED_STORAGE_DOMAIN', '');
+insert into event_map(event_up_name, event_down_name)
values('VDS_SET_NONOPERATIONAL', '');
+insert into event_map(event_up_name, event_down_name)
values('VDS_SET_NONOPERATIONAL_IFACE_DOWN', '');
+insert into event_map(event_up_name, event_down_name)
values('VDS_SET_NONOPERATIONAL_DOMAIN', '');
+insert into event_map(event_up_name, event_down_name)
values('SYSTEM_CHANGE_STORAGE_POOL_STATUS_NO_HOST_FOR_SPM', '');
+insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_STARTED_FROM_CLI', 'UNASSIGNED');
+insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_STOPPED_FROM_CLI', 'UNASSIGNED');
+insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_MEM_USE', '');
+insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_NETWORK_USE', '');
+insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_CPU_USE', '');
+insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_SWAP_USE', '');
+insert into event_map(event_up_name, event_down_name) values('VDS_LOW_SWAP',
'');
+insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_OPTION_CHANGED_FROM_CLI', 'UNASSIGNED');
INSERT INTO action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
SELECT 41, '3.1', '3.1';
@@ -117,6 +131,14 @@
-- Inserting data to history timekeeping
Insert into dwh_history_timekeeping
VALUES('lastSync',NULL,to_timestamp('01/01/2000', 'DD/MM/YYYY'));
+
+--OVF
+INSERT INTO vm_ovf_generations
+ (SELECT vm.vm_guid, sp.id, 1
+ FROM vm_static vm ,storage_pool sp, vds_groups vg
+ WHERE vg.storage_pool_id = sp.id AND vm.vds_group_id = vg.vds_group_id);
+
+
RETURN;
END; $procedure$
LANGUAGE plpgsql;
diff --git a/packaging/dbscripts/insert_predefined_roles.sql
b/packaging/dbscripts/insert_predefined_roles.sql
index 9caebd0..c36a346 100644
--- a/packaging/dbscripts/insert_predefined_roles.sql
+++ b/packaging/dbscripts/insert_predefined_roles.sql
@@ -23,6 +23,8 @@
v_TEMPLATE_CREATOR_USER_ID UUID;
v_TEMPLATE_OWNER_USER_ID UUID;
v_LOCAL_ADMIN_ID UUID;
+ v_NETWORK_USER_ID UUID;
+ v_EXTERNAL_EVENT_CREATOR_ID UUID;
--Permissions
v_CREATE_VM INTEGER;
v_DELETE_VM INTEGER;
@@ -55,11 +57,11 @@
v_CREATE_CLUSTER INTEGER;
v_EDIT_CLUSTER_CONFIGURATION INTEGER;
v_DELETE_CLUSTER INTEGER;
+ v_ASSIGN_CLUSTER_NETWORK INTEGER;
v_CONFIGURE_CLUSTER_NETWORK INTEGER;
v_MANIPULATE_USERS INTEGER;
v_MANIPULATE_ROLES INTEGER;
v_MANIPULATE_PERMISSIONS INTEGER;
- v_CREATE_STORAGE_DOMAIN INTEGER;
v_EDIT_STORAGE_DOMAIN_CONFIGURATION INTEGER;
v_DELETE_STORAGE_DOMAIN INTEGER;
v_MANIPULATE_STORAGE_DOMAIN INTEGER;
@@ -67,12 +69,17 @@
v_DELETE_STORAGE_POOL INTEGER;
v_EDIT_STORAGE_POOL_CONFIGURATION INTEGER;
v_CONFIGURE_STORAGE_POOL_NETWORK INTEGER;
+ v_CREATE_STORAGE_POOL_NETWORK INTEGER;
+ v_DELETE_STORAGE_POOL_NETWORK INTEGER;
v_CONFIGURE_ENGINE INTEGER;
v_MANIPULATE_QUOTA INTEGER;
v_CONSUME_QUOTA INTEGER;
v_CREATE_GLUSTER_VOLUME INTEGER;
v_MANIPULATE_GLUSTER_VOLUME INTEGER;
v_DELETE_GLUSTER_VOLUME INTEGER;
+ v_CREATE_STORAGE_DOMAIN INTEGER;
+ v_LIVE_MIGRATE_DISK INTEGER;
+ v_LIVE_MIGRATE_DISKS INTEGER;
v_CREATE_DISK INTEGER;
v_ATTACH_DISK INTEGER;
v_EDIT_DISK_PROPERTIES INTEGER;
@@ -80,6 +87,24 @@
v_DELETE_DISK INTEGER;
v_CONFIGURE_STORAGE_POOL_VM_INTERFACE INTEGER;
v_LOGIN INTEGER;
+ v_EXTERNAL_EVENT_INJECTION INTEGER;
+ -- Action Types
+ v_CREATE_GLUSTER_VOLUME_BRICKS INTEGER;
+ v_SET_GLUSTER_VOLUME INTEGER;
+ v_START_GLUSTER_VOLUME INTEGER;
+ v_STOP_GLUSTER_VOLUME INTEGER;
+ v_RESET_GLUSTER_VOLUME INTEGER;
+ v_DELETE_GLUSTER_VOLUME_BRICKS INTEGER;
+ v_REMOVE_GLUTER_VOLUME_BRICKS INTEGER;
+ v_REBALANCE_GLUSTER_VOLUME INTEGER;
+ v_REPLACE_GLUSTER_VOLUME_BRICKS INTEGER;
+ v_ADD_GLUSTER_VOLUME_BRICKS INTEGER;
+ v_START_GLUSTER_VOLUME_PROFILE INTEGER;
+ v_STOP_LUSTER_VOLUME_PROFILE INTEGER;
+ v_REMOVE_GLUSTER_SERVER INTEGER;
+
+ --Other
+ v_ADMIN_USER_ID UUID;
BEGIN
v_SUPER_USER_ID := '00000000-0000-0000-0000-000000000001';
@@ -102,6 +127,8 @@
v_TEMPLATE_CREATOR_USER_ID := 'DEF0000A-0000-0000-0000-DEF00000000E';
v_TEMPLATE_OWNER_USER_ID := 'DEF0000A-0000-0000-0000-DEF00000000F';
v_LOCAL_ADMIN_ID := 'FDFC627C-D875-11E0-90F0-83DF133B58CC';
+ v_NETWORK_USER_ID := 'DEF0000A-0000-0000-0000-DEF000000010';
+ v_EXTERNAL_EVENT_CREATOR_ID := 'DEF0000C-0000-0000-0000-DEF000000000';
v_CREATE_VM := 1;
v_DELETE_VM := 2;
v_EDIT_VM_PROPERTIES := 3;
@@ -134,6 +161,7 @@
v_EDIT_CLUSTER_CONFIGURATION := 401;
v_DELETE_CLUSTER := 402;
v_CONFIGURE_CLUSTER_NETWORK := 403;
+ v_ASSIGN_CLUSTER_NETWORK := 404;
v_MANIPULATE_USERS := 500;
v_MANIPULATE_ROLES := 501;
v_MANIPULATE_PERMISSIONS := 502;
@@ -145,12 +173,16 @@
v_DELETE_STORAGE_POOL := 701;
v_EDIT_STORAGE_POOL_CONFIGURATION := 702;
v_CONFIGURE_STORAGE_POOL_NETWORK := 703;
+ v_CREATE_STORAGE_POOL_NETWORK := 704;
+ v_DELETE_STORAGE_POOL_NETWORK := 705;
v_CONFIGURE_ENGINE := 800;
v_MANIPULATE_QUOTA := 900;
v_CONSUME_QUOTA := 901;
v_CREATE_GLUSTER_VOLUME := 1000;
v_MANIPULATE_GLUSTER_VOLUME := 1001;
v_DELETE_GLUSTER_VOLUME := 1002;
+ v_LIVE_MIGRATE_DISK := 1010;
+ v_LIVE_MIGRATE_DISKS := 1011;
v_CREATE_DISK := 1100;
v_ATTACH_DISK := 1101;
v_EDIT_DISK_PROPERTIES := 1102;
@@ -158,6 +190,22 @@
v_DELETE_DISK := 1104;
v_CONFIGURE_STORAGE_POOL_VM_INTERFACE := 1200;
v_LOGIN := 1300;
+ v_EXTERNAL_EVENT_INJECTION := 1500;
+ -- Action Types
+ v_CREATE_GLUSTER_VOLUME_BRICKS := 1400;
+ v_SET_GLUSTER_VOLUME := 1401;
+ v_START_GLUSTER_VOLUME := 1402;
+ v_STOP_GLUSTER_VOLUME := 1403;
+ v_RESET_GLUSTER_VOLUME := 1404;
+ v_DELETE_GLUSTER_VOLUME_BRICKS := 1405;
+ v_REMOVE_GLUTER_VOLUME_BRICKS := 1406;
+ v_REBALANCE_GLUSTER_VOLUME := 1407;
+ v_REPLACE_GLUSTER_VOLUME_BRICKS := 1408;
+ v_ADD_GLUSTER_VOLUME_BRICKS := 1409;
+ v_START_GLUSTER_VOLUME_PROFILE := 1410;
+ v_STOP_LUSTER_VOLUME_PROFILE := 1411;
+ v_REMOVE_GLUSTER_SERVER := 1412;
+
INSERT INTO
roles(id,name,description,is_readonly,role_type,allows_viewing_children) SELECT
v_SUPER_USER_ID,'SuperUser','Roles management administrator',true,1,true;
@@ -204,6 +252,8 @@
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_SUPER_USER_ID,v_DELETE_STORAGE_POOL);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_SUPER_USER_ID,v_EDIT_STORAGE_POOL_CONFIGURATION);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_SUPER_USER_ID,v_CONFIGURE_STORAGE_POOL_NETWORK);
+INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_SUPER_USER_ID,v_CREATE_STORAGE_POOL_NETWORK);
+INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_SUPER_USER_ID,v_DELETE_STORAGE_POOL_NETWORK);
INSERT INTO
roles(id,name,description,is_readonly,role_type,allows_viewing_children) SELECT
v_USER_ID,'UserRole','Standard User Role',true,2,true;
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_SUPER_USER_ID,v_CONFIGURE_ENGINE);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_USER_ID,v_VM_BASIC_OPERATIONS);
@@ -301,6 +351,8 @@
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_DATA_CENTER_ADMIN_ID,v_DELETE_STORAGE_POOL);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_DATA_CENTER_ADMIN_ID,v_EDIT_STORAGE_POOL_CONFIGURATION);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_DATA_CENTER_ADMIN_ID,v_CONFIGURE_STORAGE_POOL_NETWORK);
+INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_DATA_CENTER_ADMIN_ID,v_CREATE_STORAGE_POOL_NETWORK);
+INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_DATA_CENTER_ADMIN_ID,v_DELETE_STORAGE_POOL_NETWORK);
-------------
--STORAGE_ADMIN role
@@ -338,7 +390,6 @@
INSERT INTO
roles(id,name,description,is_readonly,role_type,allows_viewing_children) SELECT
v_NETWORK_ADMIN_ID,'NetworkAdmin','Administrator Role, permission for all
operations on a specific Logical Network',true,1,true;
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_NETWORK_ADMIN_ID,v_CONFIGURE_HOST_NETWORK);
-INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_NETWORK_ADMIN_ID,v_MANIPULATE_HOST);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_NETWORK_ADMIN_ID,v_CONFIGURE_CLUSTER_NETWORK);
-------------
@@ -360,11 +411,9 @@
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_EDIT_VM_PROPERTIES);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_VM_BASIC_OPERATIONS);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_CHANGE_VM_CD);
-INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_MIGRATE_VM);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_CONNECT_TO_VM);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_CONFIGURE_VM_NETWORK);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_CONFIGURE_VM_STORAGE);
-INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_MOVE_VM);
INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_VM_ADMIN_ID,v_MANIPULATE_VM_SNAPSHOTS);
-------------
@@ -564,6 +613,136 @@
INSERT INTO roles_groups (role_id, action_group_id) VALUES
(v_NETWORK_ADMIN_ID, v_LOGIN);
INSERT INTO roles_groups (role_id, action_group_id) VALUES
(v_GLUSTER_ADMIN_ROLE_ID, v_LOGIN);
+-- Networking
+-- Add ASSIGN_CLUSTER_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_SUPER_USER_ID,
v_ASSIGN_CLUSTER_NETWORK);
+
+-- Add ASSIGN_CLUSTER_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id)
VALUES(v_DATA_CENTER_ADMIN_ID, v_ASSIGN_CLUSTER_NETWORK);
+
+-- Add ASSIGN_CLUSTER_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_ADMIN_ID,
v_ASSIGN_CLUSTER_NETWORK);
+
+-- Add PORT_MIRRORING
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_ADMIN_ID,
v_CONFIGURE_STORAGE_POOL_VM_INTERFACE);
+
+-- Add CONFIGURE_STORAGE_POOL_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_ADMIN_ID
,v_CONFIGURE_STORAGE_POOL_NETWORK);
+
+-- Add CREATE_STORAGE_POOL_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_ADMIN_ID
,v_CREATE_STORAGE_POOL_NETWORK);
+
+-- Add DELETE_STORAGE_POOL_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_ADMIN_ID
,v_DELETE_STORAGE_POOL_NETWORK);
+
+-- Add CONFIGURE_VM_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_ADMIN_ID
,v_CONFIGURE_VM_NETWORK);
+
+-- Add CONFIGURE_TEMPLATE_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_ADMIN_ID
,v_CONFIGURE_TEMPLATE_NETWORK);
+
+-- ADD NetworkUser Role
+INSERT INTO roles(id,name,description,is_readonly,role_type)
values(v_NETWORK_USER_ID, 'NetworkUser', 'Network User', true, 2);
+
+-- Add CONFIGURE_VM_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_USER_ID,
v_CONFIGURE_VM_NETWORK);
+
+-- Add CONFIGURE_TEMPLATE_NETWORK
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_USER_ID,
v_CONFIGURE_TEMPLATE_NETWORK);
+
+
+-------------------------------------------------------
+-- Grant NetworkUser role to 'everyone' on all networks
+-------------------------------------------------------
+
+INSERT INTO permissions (id,role_id, ad_element_id, object_id, object_type_id)
+ (SELECT uuid_generate_v1(), v_NETWORK_USER_ID, getGlobalIds('everyone'),
id, 20 FROM network);
+
+-- grant admin poweruser role on system
+v_ADMIN_USER_ID := user_id from users where username = 'admin@internal';
+insert into permissions(id,role_id,ad_element_id,object_id,object_type_id)
+ values (uuid_generate_v1(), v_POWER_USER_ID, v_ADMIN_USER_ID,
getGlobalIds('system'), 1);
+
+-- Add External Event Injection priviledge to super user
+INSERT INTO roles_groups(role_id,action_group_id) VALUES(v_SUPER_USER_ID,
v_EXTERNAL_EVENT_INJECTION);
+
+-----------------------------------
+-- EXTERNAL_EVENT_CREATOR_USER role
+-----------------------------------
+
+INSERT INTO
roles(id,name,description,is_readonly,role_type,allows_viewing_children)
+ values(v_EXTERNAL_EVENT_CREATOR_ID, 'ExternalEventsCreator', 'External
Events Creator', true, 2, false);
+
+INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_EXTERNAL_EVENT_CREATOR_ID, v_EXTERNAL_EVENT_INJECTION);
+
+-----------------------------------
+-- GLUSTER VOLUME
+-----------------------------------
+
+-- Create gluster volume
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_CREATE_GLUSTER_VOLUME_BRICKS, '3.1', '*');
+
+-- Set gluster volume option
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_SET_GLUSTER_VOLUME, '3.1', '*');
+
+-- Start gluster volume
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_START_GLUSTER_VOLUME, '3.1', '*');
+
+-- Stop gluster volume
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_STOP_GLUSTER_VOLUME, '3.1', '*');
+
+-- Reset gluster volume options
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_RESET_GLUSTER_VOLUME, '3.1', '*');
+
+-- Delete gluster volume
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_DELETE_GLUSTER_VOLUME_BRICKS, '3.1', '*');
+
+-- Gluster volume remove bricks
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_REMOVE_GLUTER_VOLUME_BRICKS, '3.1', '*');
+
+-- Start gluster volume rebalance
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_REBALANCE_GLUSTER_VOLUME, '3.1', '*');
+
+-- Replace gluster volume bricks
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_REPLACE_GLUSTER_VOLUME_BRICKS, '3.1', '*');
+
+-- Add bricks to Gluster volume
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_ADD_GLUSTER_VOLUME_BRICKS, '3.1', '*');
+
+-- Start Gluster volume profile
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_START_GLUSTER_VOLUME_PROFILE, '3.2', '*');
+
+-- Stop gluster volume profile
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_STOP_LUSTER_VOLUME_PROFILE, '3.2', '*');
+
+-- Remove gluster server
+insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
+ values(v_REMOVE_GLUSTER_SERVER, '3.2', '*');
+
+-- QUOTA
+INSERT INTO roles_groups(role_id,action_group_id)
+ values(v_QUOTA_CONSUMER_USER_ID, v_CONSUME_QUOTA);
+
+-- Add Login Permission
+INSERT INTO roles_groups(role_id, action_group_id) VALUES(v_NETWORK_USER_ID,
v_LOGIN);
+
+-- lsm_version_support
+insert into action_version_map values (v_LIVE_MIGRATE_DISK, '3.2', '3.2');
+insert into action_version_map values (v_LIVE_MIGRATE_DISKS, '3.2', '3.2');
+
+
RETURN;
END; $procedure$
LANGUAGE plpgsql;
diff --git
a/packaging/dbscripts/upgrade/03_02_0010_delete_action_version_map.sql
b/packaging/dbscripts/upgrade/03_02_0010_delete_action_version_map.sql
deleted file mode 100644
index 67a0dd4..0000000
--- a/packaging/dbscripts/upgrade/03_02_0010_delete_action_version_map.sql
+++ /dev/null
@@ -1,5 +0,0 @@
---#source action_version_map_sp.sql
-------------------------------------------------------------------------------------
--- Cleanup deprecated action version section
-------------------------------------------------------------------------------------
-select fn_db_delete_version_map('2.2','2.2');
diff --git a/packaging/dbscripts/upgrade/03_02_0020_add_libvirt_version_col.sql
b/packaging/dbscripts/upgrade/03_02_0020_add_libvirt_version_col.sql
deleted file mode 100644
index 70a2389..0000000
--- a/packaging/dbscripts/upgrade/03_02_0020_add_libvirt_version_col.sql
+++ /dev/null
@@ -1 +0,0 @@
-select fn_db_add_column('vds_dynamic', 'libvirt_version', 'varchar(256)
default null');
\ No newline at end of file
diff --git
a/packaging/dbscripts/upgrade/03_02_0030_delete_permissions_on_vnic.sql
b/packaging/dbscripts/upgrade/03_02_0030_delete_permissions_on_vnic.sql
deleted file mode 100644
index 33f8928..0000000
--- a/packaging/dbscripts/upgrade/03_02_0030_delete_permissions_on_vnic.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Delete permissions if were given for VmNetworkInterface as
--- it has been removed from the entities hierarchy
-
-delete from permissions where object_type_id = 20;
diff --git
a/packaging/dbscripts/upgrade/03_02_0040_add_permissions_on_networks.sql
b/packaging/dbscripts/upgrade/03_02_0040_add_permissions_on_networks.sql
deleted file mode 100644
index 899740f..0000000
--- a/packaging/dbscripts/upgrade/03_02_0040_add_permissions_on_networks.sql
+++ /dev/null
@@ -1,133 +0,0 @@
--- Update existing roles with action groups and introduce new networks role
-
-Create or replace FUNCTION __temp_insert_predefined_roles_03_02_0030()
-RETURNS VOID
- AS $procedure$
- DECLARE
- v_SUPER_USER_ID_0001 UUID;
- v_DATA_CENTER_ADMIN_ID UUID;
- v_NETWORK_ADMIN_ID UUID;
- v_NETWORK_USER_ID UUID;
- v_everyone_object_id UUID;
-
-BEGIN
- v_SUPER_USER_ID_0001 := '00000000-0000-0000-0000-000000000001';
- v_DATA_CENTER_ADMIN_ID := 'DEF00002-0000-0000-0000-DEF000000002';
- v_NETWORK_ADMIN_ID := 'DEF00005-0000-0000-0000-DEF000000005';
- v_NETWORK_USER_ID := 'DEF0000A-0000-0000-0000-DEF000000010';
-
-
-------------------------------------------------
---- Update existing roles with new Action Groups
-------------------------------------------------
--- Add ActionGroup 704 (CREATE_STORAGE_POOL_NETWORK) to any role which
contains ActionGroup 703 (CONFIGURE_STORAGE_POOL_NETWORK)
-INSERT INTO roles_groups (role_id, action_group_id)
-SELECT DISTINCT role_id, 704
-FROM roles_groups a
-WHERE NOT EXISTS (SELECT 1
- FROM roles_groups b
- WHERE b.role_id = a.role_id
- AND b.action_group_id = 704)
-AND EXISTS (SELECT 1
- FROM roles_groups b
- WHERE b.role_id = a.role_id
- AND b.action_group_id = 703);
-
--- Add ActionGroup 705 (DELETE_STORAGE_POOL_NETWORK) to any role which
contains ActionGroup 703 (CONFIGURE_STORAGE_POOL_NETWORK)
-INSERT INTO roles_groups (role_id, action_group_id)
-SELECT DISTINCT role_id, 705
-FROM roles_groups a
-WHERE NOT EXISTS (SELECT 1
- FROM roles_groups b
- WHERE b.role_id = a.role_id
- AND b.action_group_id = 705)
-AND EXISTS (SELECT 1
- FROM roles_groups b
- WHERE b.role_id = a.role_id
- AND b.action_group_id = 703);
-
--------------------------
---- Update SuperUser role
--------------------------
-
--- Add ASSIGN_CLUSTER_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_SUPER_USER_ID_0001, 404);
-
---------------------------------
--- UPDATE DATA_CENTER_ADMIN role
---------------------------------
-
--- Add ASSIGN_CLUSTER_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_DATA_CENTER_ADMIN_ID, 404);
-
-----------------------------
--- UPDATE NETWORK_ADMIN role
-----------------------------
-
--- Add ASSIGN_CLUSTER_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_ADMIN_ID, 404);
-
--- Add PORT_MIRRORING
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_ADMIN_ID, 1200);
-
--- Add CONFIGURE_STORAGE_POOL_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_ADMIN_ID ,703);
-
--- Add CREATE_STORAGE_POOL_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_ADMIN_ID ,704);
-
--- Add DELETE_STORAGE_POOL_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_ADMIN_ID ,705);
-
--- Add CONFIGURE_VM_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_ADMIN_ID ,9);
-
--- Add CONFIGURE_TEMPLATE_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_ADMIN_ID ,204);
-
--- Delete MANIPULATE_HOST
-DELETE FROM roles_groups WHERE role_id = v_NETWORK_ADMIN_ID AND
action_group_id = 103;
-
-------------------------
--- ADD NETWORK_USER role
-------------------------
-DELETE FROM roles_groups WHERE role_id = v_NETWORK_USER_ID;
-INSERT INTO roles(id,name,description,is_readonly,role_type) SELECT
v_NETWORK_USER_ID, 'NetworkUser', 'Network User', true, 2
-WHERE NOT EXISTS (SELECT id,name,description,is_readonly,role_type
- FROM roles
- WHERE id = v_NETWORK_USER_ID
- AND name='NetworkUser'
- AND description='Network User'
- AND is_readonly=true
- AND role_type=2);
-
--- Add CONFIGURE_VM_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_USER_ID, 9);
-
--- Add CONFIGURE_TEMPLATE_NETWORK
-PERFORM fn_db_add_action_group_to_role(v_NETWORK_USER_ID, 204);
-
--------------------------------------------------------
--- Grant NetworkUser role to 'everyone' on all networks
--------------------------------------------------------
-v_everyone_object_id := getGlobalIds('everyone');
-
-INSERT INTO permissions (id,
- role_id,
- ad_element_id,
- object_id,
- object_type_id)
- (SELECT uuid_generate_v1(),
- v_NETWORK_USER_ID,
- v_everyone_object_id,
- id,
- 20
- FROM network);
-
- RETURN;
-END; $procedure$
-LANGUAGE plpgsql;
-
-SELECT __temp_insert_predefined_roles_03_02_0030();
-DROP function __temp_insert_predefined_roles_03_02_0030();
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0050_add_vm_guest_agent_interfaces_table.sql
b/packaging/dbscripts/upgrade/03_02_0050_add_vm_guest_agent_interfaces_table.sql
deleted file mode 100644
index e6592dd..0000000
---
a/packaging/dbscripts/upgrade/03_02_0050_add_vm_guest_agent_interfaces_table.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- Add the vm_guest_agent_interfaces table.
-CREATE TABLE vm_guest_agent_interfaces
-(
- vm_id UUID NOT NULL,
- interface_name VARCHAR (50),
- mac_address VARCHAR(59),
- ipv4_addresses text,
- ipv6_addresses text,
- CONSTRAINT FK_vm_guest_agent_interfaces FOREIGN KEY(vm_id) REFERENCES
vm_static(vm_guid) ON UPDATE NO ACTION ON DELETE CASCADE
-) WITH OIDS;
diff --git
a/packaging/dbscripts/upgrade/03_02_0060_change_host_to_server_event_map.sql
b/packaging/dbscripts/upgrade/03_02_0060_change_host_to_server_event_map.sql
deleted file mode 100644
index 34f7373..0000000
--- a/packaging/dbscripts/upgrade/03_02_0060_change_host_to_server_event_map.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Change Host to Server in gluster related events
-insert into event_map(event_up_name, event_down_name)
values('GLUSTER_SERVER_ADD_FAILED', 'UNASSIGNED');
-insert into event_map(event_up_name, event_down_name)
values('GLUSTER_SERVER_REMOVE_FAILED', 'UNASSIGNED');
-
-update event_subscriber set event_up_name = 'GLUSTER_SERVER_ADD_FAILED' where
event_up_name = 'GLUSTER_HOST_ADD_FAILED';
-update event_subscriber set event_up_name = 'GLUSTER_SERVER_REMOVE_FAILED'
where event_up_name = 'GLUSTER_HOST_REMOVE_FAILED';
-
-delete from event_map where event_up_name='GLUSTER_HOST_ADD_FAILED';
-delete from event_map where event_up_name='GLUSTER_HOST_REMOVE_FAILED';
diff --git
a/packaging/dbscripts/upgrade/03_02_0070_ha_vm_event_notifications.sql
b/packaging/dbscripts/upgrade/03_02_0070_ha_vm_event_notifications.sql
deleted file mode 100644
index d54eac1..0000000
--- a/packaging/dbscripts/upgrade/03_02_0070_ha_vm_event_notifications.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-insert into event_map(event_up_name, event_down_name)
values('HA_VM_RESTART_FAILED', '');
-insert into event_map(event_up_name, event_down_name) values('HA_VM_FAILED',
'');
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0080_add_user_vm_manager_to_vm_power_users.sql
b/packaging/dbscripts/upgrade/03_02_0080_add_user_vm_manager_to_vm_power_users.sql
deleted file mode 100644
index d490511..0000000
---
a/packaging/dbscripts/upgrade/03_02_0080_add_user_vm_manager_to_vm_power_users.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Inserting a UserVmManager permission on every PowerUser permission directly
on a VM
-INSERT INTO permissions (id, role_id, ad_element_id, object_id, object_type_id)
- (SELECT uuid_generate_v1(),
- 'def00006-0000-0000-0000-def000000006',
- ad_element_id,
- object_id,
- object_type_id
- FROM permissions perm1
- WHERE role_id = '00000000-0000-0000-0001-000000000002'
- AND object_type_id = 2 AND NOT EXISTS (
- SELECT *
- FROM permissions perm2
- WHERE role_id = 'def00006-0000-0000-0000-def000000006'
- AND object_type_id = 2
- AND perm1.object_id = perm2.object_id
- AND perm1.ad_element_id = perm2.ad_element_id
- )
-);
diff --git a/packaging/dbscripts/upgrade/03_02_0090_cpuhost_support.sql
b/packaging/dbscripts/upgrade/03_02_0090_cpuhost_support.sql
deleted file mode 100644
index 86c1610..0000000
--- a/packaging/dbscripts/upgrade/03_02_0090_cpuhost_support.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-
-select fn_db_add_column('vm_static', 'host_cpu_flags', 'boolean default
false');
-
diff --git a/packaging/dbscripts/upgrade/03_02_0100_add_cpu_thread_columns.sql
b/packaging/dbscripts/upgrade/03_02_0100_add_cpu_thread_columns.sql
deleted file mode 100644
index c56a92e..0000000
--- a/packaging/dbscripts/upgrade/03_02_0100_add_cpu_thread_columns.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select fn_db_add_column('vds_groups', 'count_threads_as_cores', 'BOOLEAN NOT
NULL DEFAULT FALSE');
-
-select fn_db_add_column('vds_dynamic', 'cpu_threads', 'INTEGER');
diff --git
a/packaging/dbscripts/upgrade/03_02_0110_add_nic_hash_column_to_vm_dynamic.sql
b/packaging/dbscripts/upgrade/03_02_0110_add_nic_hash_column_to_vm_dynamic.sql
deleted file mode 100644
index 1eb3945..0000000
---
a/packaging/dbscripts/upgrade/03_02_0110_add_nic_hash_column_to_vm_dynamic.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select fn_db_add_column('vm_dynamic', 'guest_agent_nics_hash', 'integer');
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0120_add_index_to_vm_guest_agent_interfaces.sql
b/packaging/dbscripts/upgrade/03_02_0120_add_index_to_vm_guest_agent_interfaces.sql
deleted file mode 100644
index 7522232..0000000
---
a/packaging/dbscripts/upgrade/03_02_0120_add_index_to_vm_guest_agent_interfaces.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Create partial index for fetching guest agent nics for a VM
-CREATE INDEX IDX_vm_guest_agent_interfaces_vm_id ON
vm_guest_agent_interfaces(vm_id);
diff --git
a/packaging/dbscripts/upgrade/03_02_0130_add_linked_to_vm_interface.sql
b/packaging/dbscripts/upgrade/03_02_0130_add_linked_to_vm_interface.sql
deleted file mode 100644
index d60f2bf..0000000
--- a/packaging/dbscripts/upgrade/03_02_0130_add_linked_to_vm_interface.sql
+++ /dev/null
@@ -1 +0,0 @@
-select fn_db_add_column('vm_interface', 'linked', 'boolean NOT NULL DEFAULT
true');
diff --git
a/packaging/dbscripts/upgrade/03_02_0140_allow_null_network_name_in_vm_interfaces.sql
b/packaging/dbscripts/upgrade/03_02_0140_allow_null_network_name_in_vm_interfaces.sql
deleted file mode 100644
index ec41e50..0000000
---
a/packaging/dbscripts/upgrade/03_02_0140_allow_null_network_name_in_vm_interfaces.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE vm_interface ALTER COLUMN network_name DROP NOT NULL;
-
-UPDATE vm_interface
-SET network_name = NULL
-WHERE network_name = '';
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0150_add_console_cur_user_name.sql
b/packaging/dbscripts/upgrade/03_02_0150_add_console_cur_user_name.sql
deleted file mode 100644
index 0bf2623..0000000
--- a/packaging/dbscripts/upgrade/03_02_0150_add_console_cur_user_name.sql
+++ /dev/null
@@ -1 +0,0 @@
-select fn_db_add_column('vm_dynamic', 'console_cur_user_name', 'varchar(255)');
diff --git
a/packaging/dbscripts/upgrade/03_02_0160_drop_guest_user_id_column.sql
b/packaging/dbscripts/upgrade/03_02_0160_drop_guest_user_id_column.sql
deleted file mode 100644
index 7f6b7e3..0000000
--- a/packaging/dbscripts/upgrade/03_02_0160_drop_guest_user_id_column.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT fn_db_drop_column('vm_dynamic', 'guest_cur_user_id');
diff --git
a/packaging/dbscripts/upgrade/03_02_0170_add_admin_internal_user_role_system.sql
b/packaging/dbscripts/upgrade/03_02_0170_add_admin_internal_user_role_system.sql
deleted file mode 100644
index b26eee8..0000000
---
a/packaging/dbscripts/upgrade/03_02_0170_add_admin_internal_user_role_system.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- grant admin poweruser role on system
-CREATE OR REPLACE FUNCTION
__temp_grant_admin_internal_poweruser_role_on_system()
- RETURNS void AS
-$BODY$
- DECLARE
- v_user_id uuid ;
- v_power_user_role_id uuid;
-BEGIN
- v_user_id := user_id from users where username = 'admin@internal';
- v_power_user_role_id := '00000000-0000-0000-0001-000000000002';
-
- insert into permissions(id,role_id,ad_element_id,object_id,object_type_id)
- select uuid_generate_v1(), v_power_user_role_id, v_user_id,
getGlobalIds('system'), 1
- where not exists
- (select 1 from permissions
- where role_id = v_power_user_role_id and
- ad_element_id = v_user_id and
- object_id= getGlobalIds('system') and
- object_type_id = 1);
-END; $BODY$
-
-LANGUAGE plpgsql;
-
-select __temp_grant_admin_internal_poweruser_role_on_system();
-drop function __temp_grant_admin_internal_poweruser_role_on_system();
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0180_add_pm_proxy_preferences.sql
b/packaging/dbscripts/upgrade/03_02_0180_add_pm_proxy_preferences.sql
deleted file mode 100644
index 73a7800..0000000
--- a/packaging/dbscripts/upgrade/03_02_0180_add_pm_proxy_preferences.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select fn_db_add_column('vds_static', 'pm_proxy_preferences', 'varchar(255)
default ''''');
-
diff --git a/packaging/dbscripts/upgrade/03_02_0190_add_vds_hardware_info.sql
b/packaging/dbscripts/upgrade/03_02_0190_add_vds_hardware_info.sql
deleted file mode 100644
index 851f611..0000000
--- a/packaging/dbscripts/upgrade/03_02_0190_add_vds_hardware_info.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-select fn_db_add_column('vds_dynamic', 'hw_manufacturer', 'VARCHAR(255)');
-select fn_db_add_column('vds_dynamic', 'hw_product_name', 'VARCHAR(255)');
-select fn_db_add_column('vds_dynamic', 'hw_version', 'VARCHAR(255)');
-select fn_db_add_column('vds_dynamic', 'hw_serial_number', 'VARCHAR(255)');
-select fn_db_add_column('vds_dynamic', 'hw_uuid', 'VARCHAR(255)');
-select fn_db_add_column('vds_dynamic', 'hw_family', 'VARCHAR(255)');
diff --git
a/packaging/dbscripts/upgrade/03_02_0200_add_vm_generation_columns.sql
b/packaging/dbscripts/upgrade/03_02_0200_add_vm_generation_columns.sql
deleted file mode 100644
index d4f8909..0000000
--- a/packaging/dbscripts/upgrade/03_02_0200_add_vm_generation_columns.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-SELECT fn_db_add_column('vm_static', 'db_generation', 'BIGINT default 1');
-
--- not added as foreign key so that when vm is removed, its record in
vm_ovf_generations record will stay
-CREATE TABLE vm_ovf_generations
-(
- vm_guid UUID PRIMARY KEY,
- storage_pool_id UUID REFERENCES storage_pool(id) ON DELETE CASCADE,
- ovf_generation BIGINT DEFAULT 0
-);
-
--- Only pre-existing vms should have ovf_generation set to 1
-INSERT INTO vm_ovf_generations
- (SELECT vm.vm_guid, sp.id, 1
- FROM vm_static vm ,storage_pool sp, vds_groups vg
- WHERE vg.storage_pool_id = sp.id AND vm.vds_group_id = vg.vds_group_id);
-
-CREATE INDEX IDX_vm_ovf_generations_vm_guid ON vm_ovf_generations(vm_guid);
-CREATE INDEX IDX_vm_ovf_generations_storage_pool_id ON
vm_ovf_generations(storage_pool_id);
\ No newline at end of file
diff --git a/packaging/dbscripts/upgrade/03_02_0210_add_external_events.sql
b/packaging/dbscripts/upgrade/03_02_0210_add_external_events.sql
deleted file mode 100644
index 838930b..0000000
--- a/packaging/dbscripts/upgrade/03_02_0210_add_external_events.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Adding to audit_log fields used for External Events that may be invoked by
plug-ins
-select fn_db_add_column('audit_log', 'origin', 'VARCHAR(255) DEFAULT
''oVirt''');
-select fn_db_add_column('audit_log', 'custom_event_id', 'INTEGER DEFAULT -1');
-select fn_db_add_column('audit_log', 'event_flood_in_sec', 'INTEGER DEFAULT
30');
-select fn_db_add_column('audit_log', 'custom_data', 'TEXT DEFAULT ''''');
-select fn_db_add_column('audit_log', 'deleted', 'BOOLEAN DEFAULT false');
-
--- Add an Index on origin,custom_event_id
-CREATE UNIQUE INDEX audit_log_origin_custom_event_id_idx ON audit_log
-(origin, custom_event_id)
-where origin not ilike 'ovirt';
-
--- Add External Event Injection priviledge to super user
-INSERT INTO roles_groups(role_id,action_group_id)
VALUES('00000000-0000-0000-0000-000000000001',1400);
-
--- define a role for External Event injection
------------------------------------
--- EXTERNAL_EVENT_CREATOR_USER role
------------------------------------
-Create or replace FUNCTION
__temp_insert_predefined_externa_events_creator_role()
-RETURNS VOID
- AS $procedure$
- DECLARE
- v_external_event_creator_user_id UUID;
-BEGIN
- v_external_event_creator_user_id := 'DEF0000C-0000-0000-0000-DEF000000000';
-
-INSERT INTO
roles(id,name,description,is_readonly,role_type,allows_viewing_children) SELECT
v_external_event_creator_user_id, 'ExternalEventsCreator', 'External Events
Creator', true, 2, false
-WHERE NOT EXISTS (SELECT id,name,description,is_readonly,role_type
- FROM roles
- WHERE id = v_external_event_creator_user_id
- AND name='ExternalEventsCreator'
- AND description='External Events Creator'
- AND is_readonly=true
- AND role_type=2);
-
-INSERT INTO roles_groups(role_id,action_group_id)
VALUES(v_external_event_creator_user_id, 1400);
-
-RETURN;
-END; $procedure$
-LANGUAGE plpgsql;
-
-SELECT __temp_insert_predefined_externa_events_creator_role();
-DROP function __temp_insert_predefined_externa_events_creator_role();
diff --git
a/packaging/dbscripts/upgrade/03_02_0220_add_pm_multi_agent_support.sql
b/packaging/dbscripts/upgrade/03_02_0220_add_pm_multi_agent_support.sql
deleted file mode 100644
index 064b090..0000000
--- a/packaging/dbscripts/upgrade/03_02_0220_add_pm_multi_agent_support.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- Adding secondary PM agent device fields
-select fn_db_add_column('vds_static', 'pm_secondary_ip', 'VARCHAR(255) NULL');
-select fn_db_add_column('vds_static', 'pm_secondary_type', 'VARCHAR(20) NULL');
-select fn_db_add_column('vds_static', 'pm_secondary_user', 'VARCHAR(50) NULL');
-select fn_db_add_column('vds_static', 'pm_secondary_password', 'TEXT NULL');
-select fn_db_add_column('vds_static', 'pm_secondary_port', 'INTEGER NULL ');
-select fn_db_add_column('vds_static', 'pm_secondary_options', 'VARCHAR(4000)
NULL');
-select fn_db_add_column('vds_static', 'pm_secondary_concurrent', 'BOOLEAN NULL
DEFAULT false');
diff --git a/packaging/dbscripts/upgrade/03_02_0230_extend_lun_size.sql
b/packaging/dbscripts/upgrade/03_02_0230_extend_lun_size.sql
deleted file mode 100644
index bfc9517..0000000
--- a/packaging/dbscripts/upgrade/03_02_0230_extend_lun_size.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT fn_db_change_column_type('luns','lun_id','varchar','varchar(255)');
-SELECT
fn_db_change_column_type('lun_storage_server_connection_map','lun_id','varchar','varchar(255)');
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0240_add_gluster_action_version_map.sql
b/packaging/dbscripts/upgrade/03_02_0240_add_gluster_action_version_map.sql
deleted file mode 100644
index 48f11a9..0000000
--- a/packaging/dbscripts/upgrade/03_02_0240_add_gluster_action_version_map.sql
+++ /dev/null
@@ -1,52 +0,0 @@
--- Create gluster volume
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1400, '3.1', '*');
-
--- Set gluster volume option
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1401, '3.1', '*');
-
--- Start gluster volume
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1402, '3.1', '*');
-
--- Stop gluster volume
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1403, '3.1', '*');
-
--- Reset gluster volume options
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1404, '3.1', '*');
-
--- Delete gluster volume
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1405, '3.1', '*');
-
--- Gluster volume remove bricks
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1406, '3.1', '*');
-
--- Start gluster volume rebalance
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1407, '3.1', '*');
-
--- Replace gluster volume bricks
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1408, '3.1', '*');
-
--- Add bricks to Gluster volume
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1409, '3.1', '*');
-
--- Start Gluster volume profile
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1410, '3.2', '*');
-
--- Stop gluster volume profile
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1411, '3.2', '*');
-
--- Remove gluster server
-insert into action_version_map (action_type, cluster_minimal_version,
storage_pool_minimal_version)
- values(1412, '3.2', '*');
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0250_delete_actiongroups_uservmmanager.sql
b/packaging/dbscripts/upgrade/03_02_0250_delete_actiongroups_uservmmanager.sql
deleted file mode 100644
index 97995c0..0000000
---
a/packaging/dbscripts/upgrade/03_02_0250_delete_actiongroups_uservmmanager.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- remove groups: ActionGroup.MOVE_VM, ActionGroup.MIGRATE_VM
-DELETE FROM ROLES_GROUPS RG WHERE RG.ROLE_ID = (SELECT ID FROM ROLES R WHERE
R.NAME = 'UserVmManager') AND RG.ACTION_GROUP_ID IN (6,11);
diff --git a/packaging/dbscripts/upgrade/03_02_0260_add_delete_protection.sql
b/packaging/dbscripts/upgrade/03_02_0260_add_delete_protection.sql
deleted file mode 100644
index 1b4f7f6..0000000
--- a/packaging/dbscripts/upgrade/03_02_0260_add_delete_protection.sql
+++ /dev/null
@@ -1 +0,0 @@
-select fn_db_add_column('vm_static', 'is_delete_protected', 'BOOLEAN default
false');
diff --git
a/packaging/dbscripts/upgrade/03_02_0270_gluster_volume_name_unique_constraint.sql
b/packaging/dbscripts/upgrade/03_02_0270_gluster_volume_name_unique_constraint.sql
deleted file mode 100644
index 0df623e..0000000
---
a/packaging/dbscripts/upgrade/03_02_0270_gluster_volume_name_unique_constraint.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Remove the existing index which is not unique
-DROP INDEX IDX_gluster_volumes_name_unique;
-
--- Create a unique constraint
-select fn_db_create_constraint('gluster_volumes',
'gluster_volumes_name_unique', 'UNIQUE(cluster_id, vol_name)');
diff --git a/packaging/dbscripts/upgrade/03_02_0280_drop_licenses.sql
b/packaging/dbscripts/upgrade/03_02_0280_drop_licenses.sql
deleted file mode 100644
index 271da13..0000000
--- a/packaging/dbscripts/upgrade/03_02_0280_drop_licenses.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-
-DROP TABLE IF EXISTS engine_license_usage CASCADE;
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0290_change_vm_guest_agent_interface_mac_address_type.sql
b/packaging/dbscripts/upgrade/03_02_0290_change_vm_guest_agent_interface_mac_address_type.sql
deleted file mode 100644
index 9b3edf3..0000000
---
a/packaging/dbscripts/upgrade/03_02_0290_change_vm_guest_agent_interface_mac_address_type.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT
fn_db_change_column_type('vm_guest_agent_interfaces','interface_name','varchar','text');
diff --git
a/packaging/dbscripts/upgrade/03_02_0300_add_quota_consume_action_group_link.sql
b/packaging/dbscripts/upgrade/03_02_0300_add_quota_consume_action_group_link.sql
deleted file mode 100644
index 151d95d..0000000
---
a/packaging/dbscripts/upgrade/03_02_0300_add_quota_consume_action_group_link.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Inserts a link between quota role and quota action group only if missing
--- guid = consume_quota_role
--- number = consume quota action group
-INSERT INTO roles_groups(role_id,action_group_id)
-SELECT 'DEF0000a-0000-0000-0000-DEF00000000a', 901 WHERE
-NOT EXISTS (SELECT role_id,action_group_id FROM roles_groups WHERE
-role_id = 'DEF0000a-0000-0000-0000-DEF00000000a' AND action_group_id = 901);
diff --git
a/packaging/dbscripts/upgrade/03_02_0310_add_disabled_to_vm_static.sql
b/packaging/dbscripts/upgrade/03_02_0310_add_disabled_to_vm_static.sql
deleted file mode 100644
index 6f23a58..0000000
--- a/packaging/dbscripts/upgrade/03_02_0310_add_disabled_to_vm_static.sql
+++ /dev/null
@@ -1 +0,0 @@
-select fn_db_add_column('vm_static', 'is_disabled', 'boolean default false');
diff --git
a/packaging/dbscripts/upgrade/03_02_0320_fix_principal_name_in_users_for_ad_users.sql
b/packaging/dbscripts/upgrade/03_02_0320_fix_principal_name_in_users_for_ad_users.sql
deleted file mode 100644
index 6f6b09a..0000000
---
a/packaging/dbscripts/upgrade/03_02_0320_fix_principal_name_in_users_for_ad_users.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-update users set username = username || '@' || domain where position ('@' in
username) = 0;
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0330_add_vds_event_notifications.sql
b/packaging/dbscripts/upgrade/03_02_0330_add_vds_event_notifications.sql
deleted file mode 100644
index 1c52fef..0000000
--- a/packaging/dbscripts/upgrade/03_02_0330_add_vds_event_notifications.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- Add new notifications
-insert into event_map(event_up_name, event_down_name)
values('SYSTEM_DEACTIVATED_STORAGE_DOMAIN', '');
-insert into event_map(event_up_name, event_down_name)
values('VDS_SET_NONOPERATIONAL', '');
-insert into event_map(event_up_name, event_down_name)
values('VDS_SET_NONOPERATIONAL_IFACE_DOWN', '');
-insert into event_map(event_up_name, event_down_name)
values('VDS_SET_NONOPERATIONAL_DOMAIN', '');
-insert into event_map(event_up_name, event_down_name)
values('SYSTEM_CHANGE_STORAGE_POOL_STATUS_NO_HOST_FOR_SPM', '');
diff --git
a/packaging/dbscripts/upgrade/03_02_0340_gluster_volume_status_events.sql
b/packaging/dbscripts/upgrade/03_02_0340_gluster_volume_status_events.sql
deleted file mode 100644
index 2a97fdf..0000000
--- a/packaging/dbscripts/upgrade/03_02_0340_gluster_volume_status_events.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_STARTED_FROM_CLI', 'UNASSIGNED');
-insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_STOPPED_FROM_CLI', 'UNASSIGNED');
diff --git a/packaging/dbscripts/upgrade/03_02_0350_add_console_address.sql
b/packaging/dbscripts/upgrade/03_02_0350_add_console_address.sql
deleted file mode 100644
index 31f8c1d..0000000
--- a/packaging/dbscripts/upgrade/03_02_0350_add_console_address.sql
+++ /dev/null
@@ -1 +0,0 @@
-select fn_db_add_column('vds_static', 'console_address', 'VARCHAR(255) default
null');
diff --git
a/packaging/dbscripts/upgrade/03_02_0360_add_secondary_index_to_network.sql
b/packaging/dbscripts/upgrade/03_02_0360_add_secondary_index_to_network.sql
deleted file mode 100644
index 6282e3b..0000000
--- a/packaging/dbscripts/upgrade/03_02_0360_add_secondary_index_to_network.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Create partial index for fetching networks by storage pool id
-CREATE INDEX IDX_network_storage_pool_id ON network(storage_pool_id);
diff --git
a/packaging/dbscripts/upgrade/03_02_0370_add_vds_performance_notifications.sql
b/packaging/dbscripts/upgrade/03_02_0370_add_vds_performance_notifications.sql
deleted file mode 100644
index 4c62ede..0000000
---
a/packaging/dbscripts/upgrade/03_02_0370_add_vds_performance_notifications.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- Add new notifications
-insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_MEM_USE', '');
-insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_NETWORK_USE', '');
-insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_CPU_USE', '');
-insert into event_map(event_up_name, event_down_name)
values('VDS_HIGH_SWAP_USE', '');
-insert into event_map(event_up_name, event_down_name) values('VDS_LOW_SWAP',
'');
diff --git
a/packaging/dbscripts/upgrade/03_02_0380_gluster_option_changed_event.sql
b/packaging/dbscripts/upgrade/03_02_0380_gluster_option_changed_event.sql
deleted file mode 100644
index a351c23..0000000
--- a/packaging/dbscripts/upgrade/03_02_0380_gluster_option_changed_event.sql
+++ /dev/null
@@ -1 +0,0 @@
-insert into event_map(event_up_name, event_down_name)
values('GLUSTER_VOLUME_OPTION_CHANGED_FROM_CLI', 'UNASSIGNED');
diff --git
a/packaging/dbscripts/upgrade/03_02_0390_align_lun_volume_group_id.sql
b/packaging/dbscripts/upgrade/03_02_0390_align_lun_volume_group_id.sql
deleted file mode 100644
index d85b30b..0000000
--- a/packaging/dbscripts/upgrade/03_02_0390_align_lun_volume_group_id.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE luns SET volume_group_id = '' WHERE volume_group_id IS NULL;
-ALTER TABLE luns ALTER COLUMN volume_group_id SET NOT NULL;
diff --git
a/packaging/dbscripts/upgrade/03_02_0400_add_login_permission_to_network_user_role.sql
b/packaging/dbscripts/upgrade/03_02_0400_add_login_permission_to_network_user_role.sql
deleted file mode 100644
index 1e89ba1..0000000
---
a/packaging/dbscripts/upgrade/03_02_0400_add_login_permission_to_network_user_role.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Add Login Permission
-select fn_db_add_action_group_to_role('DEF0000A-0000-0000-0000-DEF000000010',
1300);
diff --git a/packaging/dbscripts/upgrade/03_02_0410_remove_user_session.sql
b/packaging/dbscripts/upgrade/03_02_0410_remove_user_session.sql
deleted file mode 100644
index 21a7aa2..0000000
--- a/packaging/dbscripts/upgrade/03_02_0410_remove_user_session.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-select fn_db_drop_column ('session_count', 'users');
-DROP TABLE user_sessions;
diff --git
a/packaging/dbscripts/upgrade/03_02_0420_materialized_views_extensions.sql
b/packaging/dbscripts/upgrade/03_02_0420_materialized_views_extensions.sql
deleted file mode 100644
index fef5f93..0000000
--- a/packaging/dbscripts/upgrade/03_02_0420_materialized_views_extensions.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Determines the minimum duration we will have to wait between 2 refreshes ,
0 means : no wait
-select fn_db_add_column('materialized_views', 'min_refresh_rate_in_sec', 'int
default 0');
--- Indicates if this is a product view or custom view
-select fn_db_add_column('materialized_views', 'custom', 'boolean default
false');
--- Indicates if this materialized_view is currently active
-select fn_db_add_column('materialized_views', 'active', 'boolean default
true');
-
diff --git a/packaging/dbscripts/upgrade/03_02_0430_dummy.sql
b/packaging/dbscripts/upgrade/03_02_0430_dummy.sql
deleted file mode 100644
index dce1ce2..0000000
--- a/packaging/dbscripts/upgrade/03_02_0430_dummy.sql
+++ /dev/null
@@ -1 +0,0 @@
-select 3020430;
diff --git a/packaging/dbscripts/upgrade/03_02_0440_dummy.sql
b/packaging/dbscripts/upgrade/03_02_0440_dummy.sql
deleted file mode 100644
index 2231071..0000000
--- a/packaging/dbscripts/upgrade/03_02_0440_dummy.sql
+++ /dev/null
@@ -1 +0,0 @@
-select 3020440;
diff --git a/packaging/dbscripts/upgrade/03_02_0450_dummy.sql
b/packaging/dbscripts/upgrade/03_02_0450_dummy.sql
deleted file mode 100644
index 4335937..0000000
--- a/packaging/dbscripts/upgrade/03_02_0450_dummy.sql
+++ /dev/null
@@ -1 +0,0 @@
-select 3020450;
diff --git
a/packaging/dbscripts/upgrade/03_02_0460_add_async_task_task_parameters.sql
b/packaging/dbscripts/upgrade/03_02_0460_add_async_task_task_parameters.sql
deleted file mode 100644
index 319fa76..0000000
--- a/packaging/dbscripts/upgrade/03_02_0460_add_async_task_task_parameters.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select fn_db_add_column('async_tasks', 'task_parameters', 'text');
-select fn_db_add_column('async_tasks', 'task_params_class', 'VARCHAR(256)');
-
diff --git a/packaging/dbscripts/upgrade/03_02_0470_lsm_version_support.sql
b/packaging/dbscripts/upgrade/03_02_0470_lsm_version_support.sql
deleted file mode 100644
index f858b12..0000000
--- a/packaging/dbscripts/upgrade/03_02_0470_lsm_version_support.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-insert into action_version_map values (1010, '3.2', '3.2');
-insert into action_version_map values (1011, '3.2', '3.2');
diff --git a/packaging/dbscripts/upgrade/03_02_0480_fix_stateless_snapshot.sql
b/packaging/dbscripts/upgrade/03_02_0480_fix_stateless_snapshot.sql
deleted file mode 100644
index 018a9be..0000000
--- a/packaging/dbscripts/upgrade/03_02_0480_fix_stateless_snapshot.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-UPDATE snapshots
-SET snapshot_type = 'REGULAR'
-WHERE description != 'stateless snapshot'
-AND snapshot_type = 'STATELESS'
-AND vm_id in (SELECT vm_guid from vm_pool_map);
-
-
diff --git
a/packaging/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql
b/packaging/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql
deleted file mode 100644
index 897299e..0000000
---
a/packaging/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-select fn_db_add_column('vds_interface_statistics', '_update_date', 'TIMESTAMP
WITH TIME ZONE default NULL');
-select fn_db_add_column('vm_interface_statistics', '_update_date', 'TIMESTAMP
WITH TIME ZONE default NULL');
-select fn_db_add_column('vm_statistics', '_update_date', 'TIMESTAMP WITH TIME
ZONE default NULL');
-select fn_db_add_column('vds_statistics', '_update_date', 'TIMESTAMP WITH TIME
ZONE default NULL');
-select fn_db_add_column('disk_image_dynamic', '_update_date', 'TIMESTAMP WITH
TIME ZONE default NULL');
-select fn_db_add_column('storage_domain_dynamic', '_update_date', 'TIMESTAMP
WITH TIME ZONE default NULL');
diff --git a/packaging/dbscripts/upgrade/03_02_0500_add_gluster_hooks_table.sql
b/packaging/dbscripts/upgrade/03_02_0500_add_gluster_hooks_table.sql
deleted file mode 100644
index c4568bc..0000000
--- a/packaging/dbscripts/upgrade/03_02_0500_add_gluster_hooks_table.sql
+++ /dev/null
@@ -1,42 +0,0 @@
-Create or replace FUNCTION __temp_fn_db_add_gluster_hooks_tables()
-RETURNS void
-AS $function$
-BEGIN
- -- Add gluster_hooks table
- CREATE TABLE gluster_hooks
- (
- id UUID NOT NULL,
- cluster_id UUID NOT NULL REFERENCES vds_groups(vds_group_id) ON
DELETE CASCADE,
- gluster_command VARCHAR(128) NOT NULL,
- stage VARCHAR(50) NOT NULL,
- name VARCHAR(256) NOT NULL,
- hook_status VARCHAR(50),
- content_type VARCHAR(50),
- checksum VARCHAR(256),
- content text,
- conflict_status INTEGER NOT NULL DEFAULT 0,
- _create_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT LOCALTIMESTAMP,
- _update_date TIMESTAMP WITH TIME ZONE,
- CONSTRAINT pk_gluster_hooks PRIMARY KEY(id)
- ) WITH OIDS;
- CREATE INDEX IDX_gluster_hooks_cluster_id ON gluster_hooks(cluster_id);
- CREATE UNIQUE INDEX IDX_gluster_hooks_unique ON gluster_hooks(cluster_id,
gluster_command, stage, name);
-
- -- Add gluster_server_hooks table
- CREATE TABLE gluster_server_hooks
- (
- hook_id UUID NOT NULL REFERENCES gluster_hooks(id) ON DELETE CASCADE,
- server_id UUID NOT NULL REFERENCES vds_static(vds_id) ON DELETE
CASCADE,
- hook_status VARCHAR(50),
- content_type VARCHAR(50),
- checksum VARCHAR(256),
- _create_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT LOCALTIMESTAMP,
- _update_date TIMESTAMP WITH TIME ZONE
- ) WITH OIDS;
- CREATE UNIQUE INDEX IDX_gluster_server_hooks_unique ON
gluster_server_hooks(hook_id, server_id);
-
-END; $function$
-LANGUAGE plpgsql;
-
-select __temp_fn_db_add_gluster_hooks_tables();
-drop function __temp_fn_db_add_gluster_hooks_tables();
diff --git a/packaging/dbscripts/upgrade/03_02_0000_set_version.sql
b/packaging/dbscripts/upgrade/03_03_0000_set_version.sql
similarity index 80%
rename from packaging/dbscripts/upgrade/03_02_0000_set_version.sql
rename to packaging/dbscripts/upgrade/03_03_0000_set_version.sql
index 28303dc..622289f 100644
--- a/packaging/dbscripts/upgrade/03_02_0000_set_version.sql
+++ b/packaging/dbscripts/upgrade/03_03_0000_set_version.sql
@@ -1,2 +1,2 @@
-- This is just a dummy command to init the right version in DB
-select 3020000;
+select 3030000;
diff --git
a/packaging/dbscripts/upgrade/03_03_0450_add_external_tasks_support.sql
b/packaging/dbscripts/upgrade/03_03_0450_add_external_tasks_support.sql
index 79f1630..8b3229c 100644
--- a/packaging/dbscripts/upgrade/03_03_0450_add_external_tasks_support.sql
+++ b/packaging/dbscripts/upgrade/03_03_0450_add_external_tasks_support.sql
@@ -3,7 +3,11 @@
select fn_db_add_column('step', 'is_external', 'boolean default false');
-- Add External Task Injection priviledge to super user
-INSERT INTO roles_groups(role_id,action_group_id)
VALUES('00000000-0000-0000-0000-000000000001',1500);
+INSERT INTO roles_groups(role_id,action_group_id) SELECT
'00000000-0000-0000-0000-000000000001',1500
+ WHERE NOT EXISTS (SELECT role_id,action_group_id
+ from roles_groups
+ WHERE role_id = '00000000-0000-0000-0000-000000000001' and
+ action_group_id = 1500);
-- define a role for External Task injection
-----------------------------------
--
To view, visit http://gerrit.ovirt.org/30899
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ce390403c6133b66726089ff3b1e0c91ec4a2c8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Eli Mesika <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
