Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove StorageDomainOwnerType
......................................................................
core: Remove StorageDomainOwnerType
The StorageDomainOwnerType enum contains only one value ("Unknown"), and
as such, is pretty useless and can be removed.
This patch removes it and all its references.
Change-Id: Iae13123bc33c2fdff2d7dd5e128c1a5cee7d262f
Signed-off-by: Allon Mureinik <[email protected]>
---
M backend/manager/dbscripts/create_views.sql
M backend/manager/dbscripts/storages_san_sp.sql
A backend/manager/dbscripts/upgrade/03_03_0110_drop_storage_owner.sql
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOwnerType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
11 files changed, 11 insertions(+), 69 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/14337/1
diff --git a/backend/manager/dbscripts/create_views.sql
b/backend/manager/dbscripts/create_views.sql
index 30929d3..38036c8 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -257,7 +257,6 @@
storage_domain_static.storage_domain_type as
storage_domain_type,
storage_domain_static.storage_domain_format_type as
storage_domain_format_type,
storage_domain_static.last_time_used_as_master as
last_time_used_as_master,
- storage_pool_iso_map.owner as owner,
fn_get_storage_domain_shared_status_by_domain_id(storage_domain_static.id,storage_pool_iso_map.status,storage_domain_static.storage_domain_type)
as storage_domain_shared_status,
storage_domain_static.recoverable as recoverable
FROM storage_domain_static
@@ -275,7 +274,7 @@
storage_domain_static.storage_type as storage_type,
storage_domain_static.storage_domain_type as storage_domain_type,
storage_domain_static.storage_domain_format_type as
storage_domain_format_type,
storage_domain_static.last_time_used_as_master as
last_time_used_as_master,
- null as owner, null as storage_pool_id, null as
storage_pool_name,
+ null as storage_pool_id, null as storage_pool_name,
storage_domain_dynamic.available_disk_size as
available_disk_size,
storage_domain_dynamic.used_disk_size as used_disk_size,
fn_get_disk_commited_value_by_storage(storage_domain_static.id)
as commited_disk_size,
@@ -299,7 +298,7 @@
WHEN status_table.is_multi_domain THEN NULL
WHEN status_table.status IS NULL THEN 2 -- in case
domain is unattached
ELSE status_table.status END as status,
- null as owner, null as storage_pool_id, null as
storage_pool_name,
+ null as storage_pool_id, null as storage_pool_name,
storage_domain_dynamic.available_disk_size as
available_disk_size,
storage_domain_dynamic.used_disk_size as used_disk_size,
fn_get_disk_commited_value_by_storage(storage_domain_static.id) as
commited_disk_size,
@@ -882,7 +881,7 @@
SELECT storage_pool.id as id, storage_pool.name as name,
storage_pool.description as description, storage_pool.storage_pool_type as
storage_pool_type, storage_pool.status as status,
storage_pool.master_domain_version as master_domain_version,
storage_pool.spm_vds_id as spm_vds_id, storage_pool.compatibility_version as
compatibility_version, storage_pool._create_date as _create_date,
storage_pool._update_date as _update_date,
storage_pool_iso_map.storage_id as storage_id,
storage_pool_iso_map.storage_pool_id as storage_pool_id,
- storage_pool_iso_map.owner as owner,
storage_domain_static.storage_type as storage_type,
storage_domain_static.storage_domain_type as storage_domain_type,
+ storage_domain_static.storage_type as storage_type,
storage_domain_static.storage_domain_type as storage_domain_type,
storage_domain_static.storage_domain_format_type as
storage_domain_format_type,
storage_domain_static.storage_name as storage_name,
storage_domain_static.storage as storage,
storage_domain_static.last_time_used_as_master as
last_time_used_as_master
diff --git a/backend/manager/dbscripts/storages_san_sp.sql
b/backend/manager/dbscripts/storages_san_sp.sql
index fe9bbfa..69e0410 100644
--- a/backend/manager/dbscripts/storages_san_sp.sql
+++ b/backend/manager/dbscripts/storages_san_sp.sql
@@ -209,13 +209,12 @@
Create or replace FUNCTION Insertstorage_pool_iso_map(v_storage_id UUID,
v_storage_pool_id UUID,
- v_status INTEGER ,
- v_owner INTEGER)
+ v_status INTEGER)
RETURNS VOID
AS $procedure$
BEGIN
-INSERT INTO storage_pool_iso_map(storage_id, storage_pool_id, status, owner)
- VALUES(v_storage_id, v_storage_pool_id, v_status, v_owner);
+INSERT INTO storage_pool_iso_map(storage_id, storage_pool_id, status)
+ VALUES(v_storage_id, v_storage_pool_id, v_status);
END; $procedure$
LANGUAGE plpgsql;
@@ -225,15 +224,14 @@
Create or replace FUNCTION Updatestorage_pool_iso_map(v_storage_id UUID,
v_storage_pool_id UUID,
- v_status INTEGER ,
- v_owner INTEGER)
+ v_status INTEGER)
RETURNS VOID
--The [storage_pool_iso_map] table doesn't have a timestamp column.
Optimistic concurrency logic cannot be generated
AS $procedure$
BEGIN
UPDATE storage_pool_iso_map
- SET status = v_status,owner = v_owner
+ SET status = v_status
WHERE storage_id = v_storage_id and storage_pool_id = v_storage_pool_id;
END; $procedure$
LANGUAGE plpgsql;
diff --git
a/backend/manager/dbscripts/upgrade/03_03_0110_drop_storage_owner.sql
b/backend/manager/dbscripts/upgrade/03_03_0110_drop_storage_owner.sql
new file mode 100644
index 0000000..9694a9f
--- /dev/null
+++ b/backend/manager/dbscripts/upgrade/03_03_0110_drop_storage_owner.sql
@@ -0,0 +1 @@
+SELECT fn_db_drop_column ('storage_pool_iso_map', 'owner');
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
index 3322486..516175d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
@@ -215,14 +215,6 @@
getStoragePoolIsoMapData().setstatus(status);
}
- public StorageDomainOwnerType getOwner() {
- return getStoragePoolIsoMapData().getowner();
- }
-
- public void setOwner(StorageDomainOwnerType owner) {
- getStoragePoolIsoMapData().setowner(owner);
- }
-
private String storagePoolName;
public String getStoragePoolName() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOwnerType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOwnerType.java
deleted file mode 100644
index cb39272..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOwnerType.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ovirt.engine.core.common.businessentities;
-
-public enum StorageDomainOwnerType {
-
- Unknown;
-
- public int getValue() {
- return this.ordinal();
- }
-
- public static StorageDomainOwnerType forValue(int value) {
- return values()[value];
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
index 85edf97..9ca25fd 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
@@ -62,29 +62,11 @@
}
}
- private Integer persistentOwner =
StorageDomainOwnerType.Unknown.getValue();
-
- public StorageDomainOwnerType getowner() {
- if (persistentOwner == null) {
- return null;
- }
- return StorageDomainOwnerType.forValue(persistentOwner);
- }
-
- public void setowner(StorageDomainOwnerType value) {
- if (value == null) {
- persistentOwner = null;
- } else {
- persistentOwner = value.getValue();
- }
- }
-
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((persistentOwner == null) ? 0 :
persistentOwner.hashCode());
result = prime * result
+ ((persistentStorageDomainStatus == null) ? 0 :
persistentStorageDomainStatus.hashCode());
return result;
@@ -103,7 +85,6 @@
}
StoragePoolIsoMap other = (StoragePoolIsoMap) obj;
return (ObjectUtils.objectsEqual(id, other.id)
- && ObjectUtils.objectsEqual(persistentOwner,
other.persistentOwner)
&& ObjectUtils.objectsEqual(persistentStorageDomainStatus,
other.persistentStorageDomainStatus));
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
index 56e3e6d..9240359 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolIsoMapDAODbFacadeImpl.java
@@ -4,7 +4,6 @@
import java.sql.SQLException;
import java.util.List;
-import org.ovirt.engine.core.common.businessentities.StorageDomainOwnerType;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId;
@@ -24,7 +23,6 @@
entity.setstorage_id(Guid.createGuidFromString(rs.getString("storage_id")));
entity.setstorage_pool_id(NGuid.createGuidFromString(rs.getString("storage_pool_id")));
entity.setstatus(StorageDomainStatus.forValue(rs.getInt("status")));
-
entity.setowner(StorageDomainOwnerType.forValue(rs.getInt("owner")));
return entity;
}
}
@@ -43,7 +41,7 @@
public void save(StoragePoolIsoMap map) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("storage_id",
map.getstorage_id()).addValue("storage_pool_id",
map.getstorage_pool_id()).addValue("status",
- map.getstatus()).addValue("owner", map.getowner());
+ map.getstatus());
getCallsHandler().executeModification("Insertstorage_pool_iso_map",
parameterSource);
}
@@ -51,7 +49,7 @@
public void update(StoragePoolIsoMap map) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("storage_id",
map.getstorage_id()).addValue("storage_pool_id",
map.getstorage_pool_id()).addValue("status",
- map.getstatus()).addValue("owner", map.getowner());
+ map.getstatus());
getCallsHandler().executeModification("Updatestorage_pool_iso_map",
parameterSource);
}
diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml
b/backend/manager/modules/dal/src/test/resources/fixtures.xml
index c49aa37..392209f 100644
--- a/backend/manager/modules/dal/src/test/resources/fixtures.xml
+++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml
@@ -2336,48 +2336,40 @@
<column>storage_id</column>
<column>storage_pool_id</column>
<column>status</column>
- <column>owner</column>
<row>
<value>72e3a666-89e1-4005-a7ca-f7548004a9ab</value>
<value>6d849ebf-755f-4552-ad09-9a090cda105d</value>
<value>3</value>
- <value>0</value>
</row>
<row>
<value>17e7489d-d490-4681-a322-073ca19bd33d</value>
<value>72b9e200-f48b-4687-83f2-62828f249a47</value>
<value>3</value>
- <value>0</value>
</row>
<row>
<value>c2211b56-8869-41cd-84e1-78d7cb96f31d</value>
<value>72b9e200-f48b-4687-83f2-62828f249a47</value>
<value>3</value>
- <value>0</value>
</row>
<row>
<value>d9ede37f-e6c3-4bf9-a984-19174070aa31</value>
<value>386bffd1-e7ed-4b08-bce9-d7df10f8c9a0</value>
<value>3</value>
- <value>0</value>
</row>
<row>
<value>d034f3b2-fb9c-414a-b1be-1e642cfe57ae</value>
<value>386bffd1-e7ed-4b08-bce9-d7df10f8c9a0</value>
<value>3</value>
- <value>0</value>
</row>
<row>
<value>d9ede37f-e6c3-4bf9-a984-19174070aa32</value>
<value>386bffd1-e7ed-4b08-bce9-d7df10f8c9a1</value>
<value>3</value>
- <value>0</value>
</row>
<row>
<value>d034f3b2-fb9c-414a-b1be-1e642cfe57ae</value>
<value>386bffd1-e7ed-4b08-bce9-d7df10f8c9a1</value>
<value>3</value>
- <value>0</value>
</row>
</table>
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java
index 6801b2f..e40b64f 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java
@@ -6,7 +6,6 @@
import java.io.ObjectOutputStream;
import org.junit.Test;
-import org.ovirt.engine.core.common.businessentities.StorageDomainOwnerType;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.compat.Guid;
@@ -20,7 +19,6 @@
isoMap.setstorage_id(Guid.NewGuid());
isoMap.setstorage_pool_id(Guid.NewGuid());
isoMap.setstatus(StorageDomainStatus.Active);
- isoMap.setowner(StorageDomainOwnerType.Unknown);
new ObjectOutputStream(outputStream).writeObject(isoMap);
byte[] bytes = outputStream.toByteArray();
ObjectStreamDeserializer deserializer = new
ObjectStreamDeserializer();
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java
index c30a5a3..bfccf85 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java
@@ -6,7 +6,6 @@
import java.io.ObjectInputStream;
import org.junit.Test;
-import org.ovirt.engine.core.common.businessentities.StorageDomainOwnerType;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.compat.Guid;
@@ -20,7 +19,6 @@
isoMap.setstorage_id(Guid.NewGuid());
isoMap.setstorage_pool_id(Guid.NewGuid());
isoMap.setstatus(StorageDomainStatus.Active);
- isoMap.setowner(StorageDomainOwnerType.Unknown);
byte[] bytes = (byte[]) serializer.serialize(isoMap);
StoragePoolIsoMap readEntity =
(StoragePoolIsoMap) new ObjectInputStream(new
ByteArrayInputStream(bytes)).readObject();
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index 6bfba77..475ac14 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -77,7 +77,6 @@
<include
name="common/businessentities/StoragePoolIsoMapId.java" />
<include name="common/businessentities/StoragePool.java" />
<include
name="common/businessentities/StorageServerConnections.java" />
- <include
name="common/businessentities/StorageDomainOwnerType.java" />
<include
name="common/businessentities/StorageDomainSharedStatus.java" />
<include
name="common/businessentities/StorageDomainStatus.java" />
<include name="common/businessentities/StorageDomainType.java"
/>
--
To view, visit http://gerrit.ovirt.org/14337
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae13123bc33c2fdff2d7dd5e128c1a5cee7d262f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
