Daniel Erez has uploaded a new change for review.
Change subject: core: add cinder_volume_type to base_disks table
......................................................................
core: add cinder_volume_type to base_disks table
Adding cinder_volume_type column to base_disks table to
represent a volume type defined in Cinder (e.g. ceph/lvm/etc).
* Updated base_disks_sp: InsertBaseDisk / UpdateBaseDisk
* Updated create_views: images_storage_domain_view / vm_images_view /
all_disks_including_snapshots
* Added 'cinderVolumeType' String to BaseDisk business entity.
Change-Id: Ib2be3d75e50ae72062d6222ad917b578176a6590
Bug-Url: https://bugzilla.redhat.com/1185826
Signed-off-by: Daniel Erez <[email protected]>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDiskDaoDbFacadeImpl.java
M packaging/dbscripts/base_disks_sp.sql
M packaging/dbscripts/create_views.sql
A
packaging/dbscripts/upgrade/03_06_1080_add_cinder_volume_type_column_to_base_disks.sql
5 files changed, 28 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/39011/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
index c502c2d..9027e4f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
@@ -82,6 +82,8 @@
private Date lastAlignmentScan;
+ private String cinderVolumeType;
+
public BaseDisk() {
propagateErrors = PropagateErrors.Off;
alignment = DiskAlignment.Unknown;
@@ -194,6 +196,14 @@
lastAlignmentScan = (value != null) ? (Date) value.clone() : null;
}
+ public String getCinderVolumeType() {
+ return cinderVolumeType;
+ }
+
+ public void setCinderVolumeType(String cinderVolumeType) {
+ this.cinderVolumeType = cinderVolumeType;
+ }
+
@Override
public int hashCode() {
final int prime = 31;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDiskDaoDbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDiskDaoDbFacadeImpl.java
index 80b5d1b..f5af0e6 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDiskDaoDbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDiskDaoDbFacadeImpl.java
@@ -31,7 +31,8 @@
.addValue("sgio", entity.getSgio())
.addValue("alignment", entity.getAlignment())
.addValue("last_alignment_scan", entity.getLastAlignmentScan())
- .addValue("disk_storage_type", ((Disk)
entity).getDiskStorageType());
+ .addValue("disk_storage_type", ((Disk)
entity).getDiskStorageType())
+ .addValue("cinder_volume_type", entity.getCinderVolumeType());
}
@Override
diff --git a/packaging/dbscripts/base_disks_sp.sql
b/packaging/dbscripts/base_disks_sp.sql
index 2b97f02..48e7f90 100644
--- a/packaging/dbscripts/base_disks_sp.sql
+++ b/packaging/dbscripts/base_disks_sp.sql
@@ -19,7 +19,8 @@
v_sgio INTEGER,
v_alignment SMALLINT,
v_last_alignment_scan TIMESTAMP WITH TIME ZONE,
- v_disk_storage_type SMALLINT)
+ v_disk_storage_type SMALLINT,
+ v_cinder_volume_type VARCHAR(255))
RETURNS VOID
AS $procedure$
BEGIN
@@ -35,7 +36,8 @@
sgio,
alignment,
last_alignment_scan,
- disk_storage_type)
+ disk_storage_type,
+ cinder_volume_type)
VALUES(
v_disk_id,
v_disk_interface,
@@ -48,7 +50,8 @@
v_sgio,
v_alignment,
v_last_alignment_scan,
- v_disk_storage_type);
+ v_disk_storage_type,
+ v_cinder_volume_type);
END; $procedure$
LANGUAGE plpgsql;
@@ -68,7 +71,8 @@
v_sgio INTEGER,
v_alignment SMALLINT,
v_last_alignment_scan TIMESTAMP WITH TIME ZONE,
- v_disk_storage_type SMALLINT)
+ v_disk_storage_type SMALLINT,
+ v_cinder_volume_type VARCHAR(255))
RETURNS VOID
AS $procedure$
BEGIN
@@ -83,7 +87,8 @@
sgio = v_sgio,
alignment = v_alignment,
last_alignment_scan = v_last_alignment_scan,
- disk_storage_type = v_disk_storage_type
+ disk_storage_type = v_disk_storage_type,
+ cinder_volume_type = v_cinder_volume_type
WHERE disk_id = v_disk_id;
END; $procedure$
LANGUAGE plpgsql;
diff --git a/packaging/dbscripts/create_views.sql
b/packaging/dbscripts/create_views.sql
index 91f1bd5..0f2f47b 100644
--- a/packaging/dbscripts/create_views.sql
+++ b/packaging/dbscripts/create_views.sql
@@ -95,6 +95,7 @@
disk_image_dynamic.flush_latency_seconds AS flush_latency_seconds,
base_disks.alignment AS alignment,
base_disks.disk_storage_type as disk_storage_type,
+ base_disks.cinder_volume_type as cinder_volume_type,
base_disks.last_alignment_scan AS last_alignment_scan,
EXISTS (
SELECT
@@ -242,7 +243,8 @@
images_storage_domain_view.alignment AS alignment,
images_storage_domain_view.last_alignment_scan AS last_alignment_scan,
images_storage_domain_view.ovf_store AS ovf_store,
- images_storage_domain_view.disk_storage_type as disk_storage_type
+ images_storage_domain_view.disk_storage_type as disk_storage_type,
+ images_storage_domain_view.cinder_volume_type as cinder_volume_type
FROM
images_storage_domain_view
INNER JOIN disk_image_dynamic ON images_storage_domain_view.image_guid =
disk_image_dynamic.image_id
@@ -265,7 +267,8 @@
bd.sgio,
bd.alignment,
bd.last_alignment_scan,
- bd.disk_storage_type
+ bd.disk_storage_type,
+ bd.cinder_volume_type
FROM (
SELECT
storage_for_image_view.storage_id AS storage_id,
diff --git
a/packaging/dbscripts/upgrade/03_06_1080_add_cinder_volume_type_column_to_base_disks.sql
b/packaging/dbscripts/upgrade/03_06_1080_add_cinder_volume_type_column_to_base_disks.sql
new file mode 100644
index 0000000..2a48db1
--- /dev/null
+++
b/packaging/dbscripts/upgrade/03_06_1080_add_cinder_volume_type_column_to_base_disks.sql
@@ -0,0 +1 @@
+select fn_db_add_column('base_disks', 'cinder_volume_type', 'VARCHAR(255)');
\ No newline at end of file
--
To view, visit https://gerrit.ovirt.org/39011
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2be3d75e50ae72062d6222ad917b578176a6590
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
